Update to 2.0.0 tree from current Fremantle build

[opencv] / samples / c / distrans.c

diff --git a/samples/c/distrans.c b/samples/c/distrans.c
index d58c634..497ead0 100644 (file)
--- a/samples/c/distrans.c
+++ b/samples/c/distrans.c
@@ -1,3 +1,5 @@
+#define CV_NO_BACKWARD_COMPATIBILITY
+
 #ifdef _CH_
 #pragma package <opencv>
 #endif
@@ -27,7 +29,7 @@ IplImage* labels = 0;
 // threshold trackbar callback
 void on_trackbar( int dummy )
 {
-    static const uchar colors[][3] = 
+    static const uchar colors[][3] =
     {
         {0,0,0},
         {255,0,0},
@@ -39,7 +41,7 @@ void on_trackbar( int dummy )
         {0,0,255},
         {255,0,255}
     };
-    
+
     int msize = mask_size;
     int _dist_type = build_voronoi ? CV_DIST_L2 : dist_type;
 
@@ -61,7 +63,7 @@ void on_trackbar( int dummy )
         // begin "painting" the distance transform result
         cvConvertScale( dist, dist, 5000.0, 0 );
         cvPow( dist, dist, 0.5 );
-    
+
         cvConvertScale( dist, dist32s, 1.0, 0.5 );
         cvAndS( dist32s, cvScalarAll(255), dist32s, 0 );
         cvConvertScale( dist32s, dist8u1, 1, 0 );
@@ -91,7 +93,7 @@ void on_trackbar( int dummy )
             }
         }
     }
-    
+
     cvShowImage( wndname, dist8u );
 }
 
@@ -111,7 +113,7 @@ int main( int argc, char** argv )
         "\t5 - use 5x5 mask\n"
         "\t0 - use precise distance transform\n"
         "\tv - switch Voronoi diagram mode on/off\n"
-        "\tENTER - loop through all the modes\n" );
+        "\tSPACE - loop through all the modes\n" );
 
     dist = cvCreateImage( cvGetSize(gray), IPL_DEPTH_32F, 1 );
     dist8u1 = cvCloneImage( gray );
@@ -128,7 +130,7 @@ int main( int argc, char** argv )
     for(;;)
     {
         int c;
-        
+
         // Call to update the view
         on_trackbar(0);
 
@@ -151,7 +153,7 @@ int main( int argc, char** argv )
             mask_size = CV_DIST_MASK_PRECISE;
         else if( (char)c == 'v' )
             build_voronoi ^= 1;
-        else if( (char)c == '\n' || (char)c == '\r' )
+        else if( (char)c == ' ' )
         {
             if( build_voronoi )
             {
@@ -180,8 +182,8 @@ int main( int argc, char** argv )
     cvReleaseImage( &dist8u2 );
     cvReleaseImage( &dist32s );
     cvReleaseImage( &labels );
-    
+
     cvDestroyWindow( wndname );
-    
+
     return 0;
 }