Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap

samples/cpp/3calibration.cpp

@@ -351,7 +351,7 @@ int main( int argc, char** argv )
         for( k = 0; k < small_canvas.rows; k += 16 )
             line(small_canvas, Point(0, k), Point(small_canvas.cols, k), Scalar(0,255,0), 1);
         imshow("rectified", small_canvas);
-        int c = waitKey(0);
+        char c = (char)waitKey(0);
         if( c == 27 || c == 'q' || c == 'Q' )
             break;
     }

samples/cpp/calibration.cpp

@@ -493,9 +493,9 @@ int main( int argc, char** argv )
         }
 
         imshow("Image View", view);
-        int key = 0xff & waitKey(capture.isOpened() ? 50 : 500);
+        char key = (char)waitKey(capture.isOpened() ? 50 : 500);
 
-        if( (key & 255) == 27 )
+        if( key == 27 )
             break;
 
         if( key == 'u' && mode == CALIBRATED )
@@ -536,8 +536,8 @@ int main( int argc, char** argv )
             //undistort( view, rview, cameraMatrix, distCoeffs, cameraMatrix );
             remap(view, rview, map1, map2, INTER_LINEAR);
             imshow("Image View", rview);
-            int c = 0xff & waitKey();
-            if( (c & 255) == 27 || c == 'q' || c == 'Q' )
+            char c = (char)waitKey();
+            if( c == 27 || c == 'q' || c == 'Q' )
                 break;
         }
     }

samples/cpp/cloning_gui.cpp

@@ -453,7 +453,7 @@ int main()
 
     for(;;)
     {
-        char key = (char) waitKey(0);
+        char key = (char)waitKey(0);
 
         if(key == 'd' && flag3 == 0)
         {

samples/cpp/convexhull.cpp

@@ -25,7 +25,6 @@ int main( int argc, char** argv )
 
     for(;;)
     {
-        char key;
         int i, count = (unsigned)rng%100 + 1;
 
         vector<Point> points;
@@ -58,7 +57,7 @@ int main( int argc, char** argv )
 
         imshow("hull", img);
 
-        key = (char)waitKey();
+        char key = (char)waitKey();
         if( key == 27 || key == 'q' || key == 'Q' ) // 'ESC'
             break;
     }

samples/cpp/detect_mser.cpp

@@ -279,8 +279,8 @@ static void DrawOpenGLMSER(Mat img, Mat result)
     for (;;)
         {
         updateWindow("OpenGL");
-        int key = waitKey(40);
-        if ((key & 0xff) == 27)
+        char key = (char)waitKey(40);
+        if (key == 27)
             break;
         if (key == 0x20)
             rotateEnable = !rotateEnable;

samples/cpp/distrans.cpp

@@ -133,7 +133,7 @@ int main( int argc, const char** argv )
         // Call to update the view
         onTrackbar(0, 0);
 
-        int c = waitKey(0) & 255;
+        char c = (char)waitKey(0);
 
         if( c == 27 )
             break;

samples/cpp/facedetect.cpp

@@ -72,9 +72,9 @@ int main( int argc, const char** argv )
     }
     if( inputName.empty() || (isdigit(inputName[0]) && inputName.size() == 1) )
     {
-        int c = inputName.empty() ? 0 : inputName[0] - '0';
-        if(!capture.open(c))
-            cout << "Capture from camera #" <<  c << " didn't work" << endl;
+        int camera = inputName.empty() ? 0 : inputName[0] - '0';
+        if(!capture.open(camera))
+            cout << "Capture from camera #" <<  camera << " didn't work" << endl;
     }
     else if( inputName.size() )
     {
@@ -104,7 +104,7 @@ int main( int argc, const char** argv )
             Mat frame1 = frame.clone();
             detectAndDraw( frame1, cascade, nestedCascade, scale, tryflip );
 
-            int c = waitKey(10);
+            char c = (char)waitKey(10);
             if( c == 27 || c == 'q' || c == 'Q' )
                 break;
         }
@@ -127,7 +127,7 @@ int main( int argc, const char** argv )
                 char buf[1000+1];
                 while( fgets( buf, 1000, f ) )
                 {
-                    int len = (int)strlen(buf), c;
+                    int len = (int)strlen(buf);
                     while( len > 0 && isspace(buf[len-1]) )
                         len--;
                     buf[len] = '\0';
@@ -136,7 +136,7 @@ int main( int argc, const char** argv )
                     if( !image.empty() )
                     {
                         detectAndDraw( image, cascade, nestedCascade, scale, tryflip );
-                        c = waitKey(0);
+                        char c = (char)waitKey(0);
                         if( c == 27 || c == 'q' || c == 'Q' )
                             break;
                     }

samples/cpp/ffilldemo.cpp

@@ -105,13 +105,13 @@ int main( int argc, char** argv )
     {
         imshow("image", isColor ? image : gray);
 
-        int c = waitKey(0);
-        if( (c & 255) == 27 )
+        char c = (char)waitKey(0);
+        if( c == 27 )
         {
             cout << "Exiting ...\n";
             break;
         }
-        switch( (char)c )
+        switch( c )
         {
         case 'c':
             if( isColor )

samples/cpp/grabcut.cpp

@@ -306,8 +306,8 @@ int main( int argc, char** argv )
 
     for(;;)
     {
-        int c = waitKey(0);
-        switch( (char) c )
+        char c = (char)waitKey(0);
+        switch( c )
         {
         case '\x1b':
             cout << "Exiting ..." << endl;

samples/cpp/laplace.cpp

@@ -83,10 +83,10 @@ int main( int argc, char** argv )
         convertScaleAbs(laplace, result, (sigma+1)*0.25);
         imshow("Laplacian", result);
 
-        int c = waitKey(30);
+        char c = (char)waitKey(30);
         if( c == ' ' )
             smoothType = smoothType == GAUSSIAN ? BLUR : smoothType == BLUR ? MEDIAN : GAUSSIAN;
-        if( c == 'q' || c == 'Q' || (c & 255) == 27 )
+        if( c == 'q' || c == 'Q' || c == 27 )
             break;
     }
 

samples/cpp/morphology2.cpp

@@ -82,21 +82,19 @@ int main( int argc, char** argv )
 
     for(;;)
     {
-        int c;
-
         OpenClose(open_close_pos, 0);
         ErodeDilate(erode_dilate_pos, 0);
-        c = waitKey(0);
+        char c = (char)waitKey(0);
 
-        if( (char)c == 27 )
+        if( c == 27 )
             break;
-        if( (char)c == 'e' )
+        if( c == 'e' )
             element_shape = MORPH_ELLIPSE;
-        else if( (char)c == 'r' )
+        else if( c == 'r' )
             element_shape = MORPH_RECT;
-        else if( (char)c == 'c' )
+        else if( c == 'c' )
             element_shape = MORPH_CROSS;
-        else if( (char)c == ' ' )
+        else if( c == ' ' )
             element_shape = (element_shape + 1) % 3;
     }
 

samples/cpp/pca.cpp

@@ -183,9 +183,9 @@ int main(int argc, char** argv)
     // display until user presses q
     imshow(winName, reconstruction);
 
-    int key = 0;
+    char key = 0;
     while(key != 'q')
-        key = waitKey();
+        key = (char)waitKey();
 
    return 0;
 }

samples/cpp/phase_corr.cpp

@@ -9,7 +9,7 @@ int main(int, char* [])
 {
     VideoCapture video(0);
     Mat frame, curr, prev, curr64f, prev64f, hann;
-    int key = 0;
+    char key;
 
     do
     {
@@ -37,10 +37,10 @@ int main(int, char* [])
         }
 
         imshow("phase shift", frame);
-        key = waitKey(2);
+        key = (char)waitKey(2);
 
         prev = curr.clone();
-    } while((char)key != 27); // Esc to exit...
+    } while(key != 27); // Esc to exit...
 
     return 0;
 }

samples/cpp/points_classifier.cpp

@@ -312,7 +312,7 @@ int main()
 
     for(;;)
     {
-        uchar key = (uchar)waitKey();
+        char key = (char)waitKey();
 
         if( key == 27 ) break;
 

samples/cpp/segment_objects.cpp

@@ -105,7 +105,7 @@ int main(int argc, char** argv)
         refineSegments(tmp_frame, bgmask, out_frame);
         imshow("video", tmp_frame);
         imshow("segmented", out_frame);
-        int keycode = waitKey(30);
+        char keycode = (char)waitKey(30);
         if( keycode == 27 )
             break;
         if( keycode == ' ' )

samples/cpp/select3dobj.cpp

@@ -285,8 +285,8 @@ static int select3DBox(const string& windowname, const string& selWinName, const
         imshow(windowname, shownFrame);
         imshow(selWinName, selectedObjFrame);
 
-        int c = waitKey(30);
-        if( (c & 255) == 27 )
+        char c = (char)waitKey(30);
+        if( c == 27 )
         {
             nobjpt = 0;
         }
@@ -593,7 +593,7 @@ int main(int argc, char** argv)
 
         imshow("View", shownFrame);
         imshow("Selected Object", selectedObjFrame);
-        int c = waitKey(imageList.empty() && !box.empty() ? 30 : 300);
+        char c = (char)waitKey(imageList.empty() && !box.empty() ? 30 : 300);
         if( c == 'q' || c == 'Q' )
             break;
         if( c == '\r' || c == '\n' )

samples/cpp/smiledetect.cpp

@@ -99,7 +99,7 @@ int main( int argc, const char** argv )
             Mat frame1 = frame.clone();
             detectAndDraw( frame1, cascade, nestedCascade, scale, tryflip );
 
-            int c = waitKey(10);
+            char c = (char)waitKey(10);
             if( c == 27 || c == 'q' || c == 'Q' )
                 break;
         }

samples/cpp/squares.cpp

@@ -167,8 +167,8 @@ int main(int argc, char** argv)
         findSquares(image, squares);
         drawSquares(image, squares);
 
-        int c = waitKey();
-        if( (char)c == 27 )
+        char c = (char)waitKey();
+        if( c == 27 )
             break;
     }
 

samples/cpp/tutorial_code/ImgProc/Pyramids.cpp

@@ -45,26 +45,22 @@ int main( void )
   //![infinite_loop]
   for(;;)
   {
-    int c;
-    c = waitKey(0);
+    char c = (char)waitKey(0);
 
-    if( (char)c == 27 )
+    if( c == 27 )
       { break; }
-    if( (char)c == 'u' )
-      {
-        //![pyrup]
-        pyrUp( tmp, dst, Size( tmp.cols*2, tmp.rows*2 ) );
-        //![pyrup]
+    //![pyrup]
+    if( c == 'u' )
+      { pyrUp( tmp, dst, Size( tmp.cols*2, tmp.rows*2 ) );
         printf( "** Zoom In: Image x 2 \n" );
       }
-    else if( (char)c == 'd' )
-      {
-        //![pyrdown]
-        pyrDown( tmp, dst, Size( tmp.cols/2, tmp.rows/2 ) );
-        //![pyrdown]
+    //![pyrup]
+    //![pyrdown]
+    else if( c == 'd' )
+      { pyrDown( tmp, dst, Size( tmp.cols/2, tmp.rows/2 ) );
         printf( "** Zoom Out: Image / 2 \n" );
       }
-
+    //![pyrdown]
     imshow( window_name, dst );
 
     //![update_tmp]

samples/cpp/tutorial_code/ImgProc/Threshold.cpp

@@ -60,9 +60,8 @@ int main( int, char** argv )
   /// Wait until user finishes program
   for(;;)
     {
-      int c;
-      c = waitKey( 20 );
-      if( (char)c == 27 )
+      char c = (char)waitKey( 20 );
+      if( c == 27 )
     { break; }
     }
 

samples/cpp/tutorial_code/ImgProc/Threshold_inRange.cpp

@@ -41,7 +41,7 @@ int main()
     createTrackbar("Low B","Object Detection", &low_b, 255, on_low_b_thresh_trackbar);
     createTrackbar("High B","Object Detection", &high_b, 255, on_high_b_thresh_trackbar);
     //! [trackbar]
-    while(char(waitKey(1))!='q'){
+    while((char)waitKey(1)!='q'){
         //! [while]
         cap>>frame;
         if(frame.empty())

samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp

@@ -90,7 +90,7 @@ int main(int argc, char** argv)
     // infinite loop to display
     // and refresh the content of the output image
     // until the user presses q or Q
-    int key = 0;
+    char key = 0;
     while(key != 'q' && key != 'Q')
     {
         // those paramaters cannot be =0
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
         HoughDetection(src_gray, src, cannyThreshold, accumulatorThreshold);
 
         // get user key
-        key = waitKey(10);
+        key = (char)waitKey(10);
     }
 
     return 0;

samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp

@@ -40,9 +40,9 @@ int main( int, char** argv )
   for(;;)
   {
     /// Each 1 sec. Press ESC to exit the program
-    int c = waitKey( 1000 );
+    char c = (char)waitKey( 1000 );
 
-    if( (char)c == 27 )
+    if( c == 27 )
       { break; }
 
     /// Update map_x & map_y. Then apply remap

samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp

@@ -23,9 +23,6 @@ RNG rng(12345);
  */
 int main( int, char** argv )
 {
-
-  int c;
-
   //![load]
   src = imread( argv[1], IMREAD_COLOR ); // Load an image
 
@@ -59,13 +56,12 @@ int main( int, char** argv )
   for(;;)
        {
          //![check_keypress]
-         c = waitKey(500);
-
-         if( (char)c == 27 )
+         char c = (char)waitKey(500);
+         if( c == 27 )
            { break; }
-         else if( (char)c == 'c' )
+         else if( c == 'c' )
            { borderType = BORDER_CONSTANT; }
-         else if( (char)c == 'r' )
+         else if( c == 'r' )
            { borderType = BORDER_REPLICATE; }
          //![check_keypress]
 

samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp

@@ -25,8 +25,6 @@ int main ( int, char** argv )
   int kernel_size;
   const char* window_name = "filter2D Demo";
 
-  int c;
-
   //![load]
   src = imread( argv[1], IMREAD_COLOR ); // Load an image
 
@@ -45,9 +43,9 @@ int main ( int, char** argv )
   int ind = 0;
   for(;;)
        {
-         c = waitKey(500);
+         char c = (char)waitKey(500);
          /// Press 'ESC' to exit the program
-         if( (char)c == 27 )
+         if( c == 27 )
            { break; }
 
          //![update_kernel]

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp

@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
 
   Mat frame, frame_vis;
 
-  while(cap.read(frame) && waitKey(30) != 27) // capture frame until ESC is pressed
+  while(cap.read(frame) && (char)waitKey(30) != 27) // capture frame until ESC is pressed
   {
 
     frame_vis = frame.clone();    // refresh visualisation frame

samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp

@@ -50,11 +50,17 @@ int main( int argc, char* argv[])
     imshow( "Output", dst0 );
     waitKey();
 
+  //![kern]
     Mat kernel = (Mat_<char>(3,3) <<  0, -1,  0,
                                    -1,  5, -1,
                                     0, -1,  0);
+  //![kern]
+
     t = (double)getTickCount();
+
+  //![filter2D]
     filter2D( src, dst1, src.depth(), kernel );
+  //![filter2D]
     t = ((double)getTickCount() - t)/getTickFrequency();
     cout << "Built-in filter2D time passed in seconds:      " << t << endl;
 
@@ -63,13 +69,19 @@ int main( int argc, char* argv[])
     waitKey();
     return 0;
 }
+//! [basic_method]
 void Sharpen(const Mat& myImage,Mat& Result)
 {
+  //! [8_bit]
     CV_Assert(myImage.depth() == CV_8U);  // accept only uchar images
+  //! [8_bit]
 
+  //! [create_channels]
     const int nChannels = myImage.channels();
     Result.create(myImage.size(),myImage.type());
+  //! [create_channels]
 
+  //! [basic_method_loop]
     for(int j = 1 ; j < myImage.rows-1; ++j)
     {
         const uchar* previous = myImage.ptr<uchar>(j - 1);
@@ -84,9 +96,13 @@ void Sharpen(const Mat& myImage,Mat& Result)
                          -current[i-nChannels] - current[i+nChannels] - previous[i] - next[i]);
         }
     }
+  //! [basic_method_loop]
 
+  //! [borders]
     Result.row(0).setTo(Scalar(0));
     Result.row(Result.rows-1).setTo(Scalar(0));
     Result.col(0).setTo(Scalar(0));
     Result.col(Result.cols-1).setTo(Scalar(0));
+  //! [borders]
 }
+//! [basic_method]

samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp

@@ -195,7 +195,7 @@ int main(int argc, char **argv)
         drawStatistics(orb_res, orb_draw_stats);
         vconcat(akaze_res, orb_res, res_frame);
         cv::imshow(video_name, res_frame);
-        if(cv::waitKey(1)==27) break; //quit on ESC button
+        if(waitKey(1)==27) break; //quit on ESC button
     }
     akaze_stats /= i - 1;
     orb_stats /= i - 1;

samples/cpp/tutorial_code/introduction/documentation/documentation.cpp

@@ -0,0 +1,14 @@
+#include <iostream>
+
+/**
+ * @function main
+ * @brief Main function
+ */
+int main( void )
+{
+    //! [hello_world]
+    std::cout << "Hello World!";
+    //! [hello_world]
+
+    return 0;
+}

samples/cpp/tutorial_code/objectDetection/objectDetection.cpp

@@ -44,8 +44,8 @@ int main( void )
         //-- 3. Apply the classifier to the frame
         detectAndDisplay( frame );
 
-        int c = waitKey(10);
-        if( (char)c == 27 ) { break; } // escape
+        char c = (char)waitKey(10);
+        if( c == 27 ) { break; } // escape
     }
     return 0;
 }

samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp

@@ -51,8 +51,8 @@ int main( void )
         detectAndDisplay( frame );
 
         //-- bail out if escape was pressed
-        int c = waitKey(10);
-        if( (char)c == 27 ) { break; }
+        char c = (char)waitKey(10);
+        if( c == 27 ) { break; }
     }
     return 0;
 }

samples/cpp/tutorial_code/photo/seamless_cloning/cloning_gui.cpp

@@ -452,7 +452,7 @@ int main()
 
     for(;;)
     {
-        char key = (char) waitKey(0);
+        char key = (char)waitKey(0);
 
         if(key == 'd' && flag3 == 0)
         {

samples/cpp/tutorial_code/video/bg_sub.cpp

@@ -23,7 +23,7 @@ using namespace std;
 Mat frame; //current frame
 Mat fgMaskMOG2; //fg mask fg mask generated by MOG2 method
 Ptr<BackgroundSubtractor> pMOG2; //MOG2 Background subtractor
-int keyboard; //input from keyboard
+char keyboard; //input from keyboard
 
 /** Function Headers */
 void help();
@@ -98,7 +98,8 @@ void processVideo(char* videoFilename) {
         exit(EXIT_FAILURE);
     }
     //read input data. ESC or 'q' for quitting
-    while( (char)keyboard != 'q' && (char)keyboard != 27 ){
+    keyboard = 0;
+    while( keyboard != 'q' && keyboard != 27 ){
         //read the current frame
         if(!capture.read(frame)) {
             cerr << "Unable to read next frame." << endl;
@@ -119,7 +120,7 @@ void processVideo(char* videoFilename) {
         imshow("Frame", frame);
         imshow("FG Mask MOG 2", fgMaskMOG2);
         //get the input from the keyboard
-        keyboard = waitKey( 30 );
+        keyboard = (char)waitKey( 30 );
     }
     //delete capture object
     capture.release();
@@ -139,7 +140,8 @@ void processImages(char* fistFrameFilename) {
     //current image filename
     string fn(fistFrameFilename);
     //read input data. ESC or 'q' for quitting
-    while( (char)keyboard != 'q' && (char)keyboard != 27 ){
+    keyboard = 0;
+    while( keyboard != 'q' && keyboard != 27 ){
         //update the background model
         pMOG2->apply(frame, fgMaskMOG2);
         //get the frame number and write it on the current frame
@@ -162,7 +164,7 @@ void processImages(char* fistFrameFilename) {
         imshow("Frame", frame);
         imshow("FG Mask MOG 2", fgMaskMOG2);
         //get the input from the keyboard
-        keyboard = waitKey( 30 );
+        keyboard = (char)waitKey( 30 );
         //search for the next image in the sequence
         ostringstream oss;
         oss << (frameNumber + 1);

samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp

@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
     conv << argv[3] << endl << argv[4];       // put in the strings
     conv >> psnrTriggerValue >> delay;        // take out the numbers
 
-    char c;
     int frameNum = -1;          // Frame counter
 
     VideoCapture captRefrnc(sourceReference), captUndTst(sourceCompareWith);
@@ -126,7 +125,7 @@ int main(int argc, char *argv[])
         imshow(WIN_RF, frameReference);
         imshow(WIN_UT, frameUnderTest);
 
-        c = (char)waitKey(delay);
+        char c = (char)waitKey(delay);
         if (c == 27) break;
     }
 

samples/cpp/watershed.cpp

@@ -74,19 +74,19 @@ int main( int argc, char** argv )
 
     for(;;)
     {
-        int c = waitKey(0);
+        char c = (char)waitKey(0);
 
-        if( (char)c == 27 )
+        if( c == 27 )
             break;
 
-        if( (char)c == 'r' )
+        if( c == 'r' )
         {
             markerMask = Scalar::all(0);
             img0.copyTo(img);
             imshow( "image", img );
         }
 
-        if( (char)c == 'w' || (char)c == ' ' )
+        if( c == 'w' || c == ' ' )
         {
             int i, j, compCount = 0;
             vector<vector<Point> > contours;

samples/gpu/bgfg_segm.cpp

@@ -161,7 +161,7 @@ int main(int argc, const char** argv)
         if (!bgimg.empty())
             imshow("mean background image", bgimg);
 
-        int key = waitKey(30);
+        char key = (char)waitKey(30);
         if (key == 27)
             break;
     }

samples/gpu/opengl.cpp

@@ -105,8 +105,8 @@ int main(int argc, char* argv[])
     for (;;)
     {
         updateWindow("OpenGL");
-        int key = waitKey(40);
-        if ((key & 0xff) == 27)
+        char key = (char)waitKey(40);
+        if (key == 27)
             break;
     }
 

samples/gpu/video_writer.cpp

@@ -11,6 +11,7 @@
 #include "opencv2/cudacodec.hpp"
 #include "opencv2/highgui.hpp"
 
+using namespace cv;
 int main(int argc, const char* argv[])
 {
     if (argc != 2)

samples/java/tutorial_code/core/mat_mask_operations/MatMaskOperations.java

@@ -0,0 +1,139 @@
+import org.opencv.core.*;
+import org.opencv.imgcodecs.Imgcodecs;
+import org.opencv.imgproc.Imgproc;
+
+import javax.swing.*;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+
+class MatMaskOperationsRun {
+
+    public void run() {
+
+    //! [laod_image]
+        Mat I = Imgcodecs.imread("../data/lena.jpg");
+        if(I.empty())
+            System.out.println("Error opening image");
+    //! [laod_image]
+
+        Image img = toBufferedImage( I );
+        displayImage("Input Image" , img, 0, 200 );
+
+        double t = System.currentTimeMillis();
+
+        Mat J = sharpen(I, new Mat());
+
+        t = ((double)System.currentTimeMillis() - t)/1000;
+        System.out.println("Hand written function times passed in seconds: " + t);
+
+        Image img2 = toBufferedImage( J );
+        displayImage("Output Image" , img2, 400, 400 );
+
+        Mat K = new Mat();
+    //![kern]
+        Mat kern = new Mat( 3, 3, CvType.CV_8S );
+        int row = 0, col = 0;
+        kern.put(row ,col, 0, -1, 0, -1, 5, -1, 0, -1, 0 );
+    //![kern]
+
+        System.out.println("kern = \n" + kern.dump());
+
+        t = System.currentTimeMillis();
+
+    //![filter2D]
+        Imgproc.filter2D(I, K, I.depth(), kern );
+    //![filter2D]
+
+        t = ((double)System.currentTimeMillis() - t)/1000;
+        System.out.println("Built-in filter2D time passed in seconds:      " + t);
+
+        Image img3 = toBufferedImage( J );
+        displayImage("filter2D Output Image" , img3, 800, 400 );
+    }
+
+    //! [basic_method]
+    public static double saturateCastUchar(double x) {
+        return x > 255.0 ? 255.0 : (x < 0.0 ? 0.0 : x);
+    }
+
+    public Mat sharpen(Mat myImage, Mat Result)
+    {
+      //! [8_bit]
+        myImage.convertTo(myImage, CvType.CV_8U);
+      //! [8_bit]
+
+      //! [create_channels]
+        int nChannels = myImage.channels();
+        Result.create(myImage.size(),myImage.type());
+      //! [create_channels]
+
+      //! [basic_method_loop]
+        for(int j = 1 ; j < myImage.rows()-1; ++j)
+        {
+            for(int i = 1 ; i < myImage.cols()-1; ++i)
+            {
+                double sum[] = new double[nChannels];
+
+                for(int k = 0; k < nChannels; ++k) {
+
+                    double top = -myImage.get(j - 1, i)[k];
+                    double bottom = -myImage.get(j + 1, i)[k];
+                    double center = (5 * myImage.get(j, i)[k]);
+                    double left = -myImage.get(j , i - 1)[k];
+                    double right = -myImage.get(j , i + 1)[k];
+
+                    sum[k] = saturateCastUchar(top + bottom + center + left + right);
+                }
+
+                Result.put(j, i, sum);
+            }
+        }
+      //! [basic_method_loop]
+
+      //! [borders]
+        Result.row(0).setTo(new Scalar(0));
+        Result.row(Result.rows()-1).setTo(new Scalar(0));
+        Result.col(0).setTo(new Scalar(0));
+        Result.col(Result.cols()-1).setTo(new Scalar(0));
+      //! [borders]
+
+        return Result;
+    }
+    //! [basic_method]
+
+    public Image toBufferedImage(Mat m) {
+        int type = BufferedImage.TYPE_BYTE_GRAY;
+        if ( m.channels() > 1 ) {
+            type = BufferedImage.TYPE_3BYTE_BGR;
+        }
+        int bufferSize = m.channels()*m.cols()*m.rows();
+        byte [] b = new byte[bufferSize];
+        m.get(0,0,b); // get all the pixels
+        BufferedImage image = new BufferedImage(m.cols(),m.rows(), type);
+        final byte[] targetPixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+        System.arraycopy(b, 0, targetPixels, 0, b.length);
+        return image;
+    }
+
+    public void displayImage(String title, Image img, int x, int y)
+    {
+        ImageIcon icon=new ImageIcon(img);
+        JFrame frame=new JFrame(title);
+        JLabel lbl=new JLabel(icon);
+        frame.add(lbl);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.pack();
+        frame.setLocation(x, y);
+        frame.setVisible(true);
+    }
+}
+
+public class MatMaskOperations {
+    public static void main(String[] args) {
+
+        // Load the native library.
+        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+        new MatMaskOperationsRun().run();
+    }
+}

samples/java/tutorial_code/introduction/documentation/Documentation.java

@@ -0,0 +1,9 @@
+public class Documentation {
+
+    public static void main (String[] args) {
+
+        //! [hello_world]
+        System.out.println ("Hello World!");
+        //! [hello_world]
+    }
+}

samples/python/camshift.py

@@ -110,7 +110,7 @@ class App(object):
 
             cv2.imshow('camshift', vis)
 
-            ch = 0xFF & cv2.waitKey(5)
+            ch = cv2.waitKey(5)
             if ch == 27:
                 break
             if ch == ord('b'):

samples/python/coherence.py

@@ -77,7 +77,7 @@ if __name__ == '__main__':
     cv2.imshow('src', src)
     update()
     while True:
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == ord(' '):
             update()
         if ch == 27:

samples/python/color_histogram.py

@@ -56,7 +56,7 @@ if __name__ == '__main__':
         vis = hsv_map*h[:,:,np.newaxis] / 255.0
         cv2.imshow('hist', vis)
 
-        ch = 0xFF & cv2.waitKey(1)
+        ch = cv2.waitKey(1)
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/contours.py

@@ -66,5 +66,5 @@ if __name__ == '__main__':
     update(3)
     cv2.createTrackbar( "levels+3", "contours", 3, 7, update )
     cv2.imshow('image', img)
-    0xFF & cv2.waitKey()
+    cv2.waitKey()
     cv2.destroyAllWindows()

samples/python/deconvolution.py

@@ -122,7 +122,7 @@ if __name__ == '__main__':
     update(None)
 
     while True:
-        ch = cv2.waitKey() & 0xFF
+        ch = cv2.waitKey()
         if ch == 27:
             break
         if ch == ord(' '):

samples/python/digits_video.py

@@ -92,7 +92,7 @@ def main():
 
         cv2.imshow('frame', frame)
         cv2.imshow('bin', bin)
-        ch = cv2.waitKey(1) & 0xFF
+        ch = cv2.waitKey(1)
         if ch == 27:
             break
 

samples/python/distrans.py

@@ -59,7 +59,7 @@ if __name__ == '__main__':
 
 
     while True:
-        ch = 0xFF & cv2.waitKey(50)
+        ch = cv2.waitKey(50)
         if ch == 27:
             break
         if ch == ord('v'):

samples/python/edge.py

@@ -49,7 +49,7 @@ if __name__ == '__main__':
         vis = np.uint8(vis/2.)
         vis[edge != 0] = (0, 255, 0)
         cv2.imshow('edge', vis)
-        ch = cv2.waitKey(5) & 0xFF
+        ch = cv2.waitKey(5)
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/facedetect.py

@@ -68,6 +68,6 @@ if __name__ == '__main__':
         draw_str(vis, (20, 20), 'time: %.1f ms' % (dt*1000))
         cv2.imshow('facedetect', vis)
 
-        if 0xFF & cv2.waitKey(5) == 27:
+        if cv2.waitKey(5) == 27:
             break
     cv2.destroyAllWindows()

samples/python/fitline.py

@@ -88,7 +88,7 @@ if __name__ == '__main__':
     cv2.createTrackbar('outlier %', 'fit line', 30, 100, update)
     while True:
         update()
-        ch = cv2.waitKey(0) & 0xFF
+        ch = cv2.waitKey(0)
         if ch == ord('f'):
             if PY3:
                 cur_func_name = next(dist_func_names)

samples/python/floodfill.py

@@ -66,7 +66,7 @@ if __name__ == '__main__':
     cv2.createTrackbar('hi', 'floodfill', 20, 255, update)
 
     while True:
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == 27:
             break
         if ch == ord('f'):

samples/python/gaussian_mix.py

@@ -63,7 +63,7 @@ if __name__ == '__main__':
             draw_gaussain(img, m, cov, (0, 0, 255))
 
         cv2.imshow('gaussian mixture', img)
-        ch = 0xFF & cv2.waitKey(0)
+        ch = cv2.waitKey(0)
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/grabcut.py

@@ -129,7 +129,7 @@ if __name__ == '__main__':
 
         cv2.imshow('output',output)
         cv2.imshow('input',img)
-        k = 0xFF & cv2.waitKey(1)
+        k = cv2.waitKey(1)
 
         # key bindings
         if k == 27:         # esc to exit

samples/python/hist.py

@@ -84,7 +84,7 @@ if __name__ == '__main__':
 
     cv2.imshow('image',im)
     while True:
-        k = cv2.waitKey(0)&0xFF
+        k = cv2.waitKey(0)
         if k == ord('a'):
             curve = hist_curve(im)
             cv2.imshow('histogram',curve)

samples/python/inpaint.py

@@ -41,7 +41,7 @@ if __name__ == '__main__':
     sketch = Sketcher('img', [img_mark, mark], lambda : ((255, 255, 255), 255))
 
     while True:
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == 27:
             break
         if ch == ord(' '):

samples/python/kalman.py

@@ -90,7 +90,7 @@ if __name__ == "__main__":
             if code != -1:
                 break
 
-        if (code % 0x100) in [27, ord('q'), ord('Q')]:
+        if code in [27, ord('q'), ord('Q')]:
             break
 
     cv2.destroyWindow("Kalman")

samples/python/kmeans.py

@@ -44,7 +44,7 @@ if __name__ == '__main__':
             cv2.circle(img, (x, y), 1, c, -1)
 
         cv2.imshow('gaussian mixture', img)
-        ch = 0xFF & cv2.waitKey(0)
+        ch = cv2.waitKey(0)
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/lappyr.py

@@ -70,5 +70,5 @@ if __name__ == '__main__':
 
         cv2.imshow('laplacian pyramid filter', res)
 
-        if cv2.waitKey(1) & 0xFF == 27:
+        if cv2.waitKey(1) == 27:
             break

samples/python/lk_homography.py

@@ -90,7 +90,7 @@ class App:
 
             cv2.imshow('lk_homography', vis)
 
-            ch = 0xFF & cv2.waitKey(1)
+            ch = cv2.waitKey(1)
             if ch == 27:
                 break
             if ch == ord(' '):

samples/python/lk_track.py

@@ -85,7 +85,7 @@ class App:
             self.prev_gray = frame_gray
             cv2.imshow('lk_track', vis)
 
-            ch = 0xFF & cv2.waitKey(1)
+            ch = cv2.waitKey(1)
             if ch == 27:
                 break
 

samples/python/morphology.py

@@ -79,7 +79,7 @@ if __name__ == '__main__':
     cv2.createTrackbar('iters', 'morphology', 1, 10, update)
     update()
     while True:
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == 27:
             break
         if ch == ord('1'):

samples/python/mosse.py

@@ -176,7 +176,7 @@ class App:
             self.rect_sel.draw(vis)
 
             cv2.imshow('frame', vis)
-            ch = cv2.waitKey(10) & 0xFF
+            ch = cv2.waitKey(10)
             if ch == 27:
                 break
             if ch == ord(' '):

samples/python/mouse_and_match.py

@@ -78,6 +78,6 @@ if __name__ == '__main__':
             drag_start = None
             gray=cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
             cv2.imshow("gray",gray)
-            if (cv2.waitKey() & 255) == 27:
+            if cv2.waitKey() == 27:
                 break
     cv2.destroyAllWindows()

samples/python/mser.py

@@ -40,6 +40,6 @@ if __name__ == '__main__':
         cv2.polylines(vis, hulls, 1, (0, 255, 0))
 
         cv2.imshow('img', vis)
-        if 0xFF & cv2.waitKey(5) == 27:
+        if cv2.waitKey(5) == 27:
             break
     cv2.destroyAllWindows()

samples/python/opt_flow.py

@@ -83,7 +83,7 @@ if __name__ == '__main__':
             cur_glitch = warp_flow(cur_glitch, flow)
             cv2.imshow('glitch', cur_glitch)
 
-        ch = 0xFF & cv2.waitKey(5)
+        ch = cv2.waitKey(5)
         if ch == 27:
             break
         if ch == ord('1'):

samples/python/peopledetect.py

@@ -65,7 +65,7 @@ if __name__ == '__main__':
         draw_detections(img, found_filtered, 3)
         print('%d (%d) found' % (len(found_filtered), len(found)))
         cv2.imshow('img', img)
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/plane_ar.py

@@ -75,7 +75,7 @@ class App:
 
             self.rect_sel.draw(vis)
             cv2.imshow('plane', vis)
-            ch = cv2.waitKey(1) & 0xFF
+            ch = cv2.waitKey(1)
             if ch == ord(' '):
                 self.paused = not self.paused
             if ch == ord('c'):

samples/python/plane_tracker.py

@@ -170,7 +170,7 @@ class App:
 
             self.rect_sel.draw(vis)
             cv2.imshow('plane', vis)
-            ch = cv2.waitKey(1) & 0xFF
+            ch = cv2.waitKey(1)
             if ch == ord(' '):
                 self.paused = not self.paused
             if ch == ord('c'):

samples/python/squares.py

@@ -49,7 +49,7 @@ if __name__ == '__main__':
         squares = find_squares(img)
         cv2.drawContours( img, squares, -1, (0, 255, 0), 3 )
         cv2.imshow('squares', img)
-        ch = 0xFF & cv2.waitKey()
+        ch = cv2.waitKey()
         if ch == 27:
             break
     cv2.destroyAllWindows()

samples/python/tst_scene_render.py

@@ -108,9 +108,9 @@ if __name__ == '__main__':
         img = render.getNextFrame()
         cv2.imshow('img', img)
 
-        ch = 0xFF & cv2.waitKey(3)
+        ch = cv2.waitKey(3)
         if  ch == 27:
             break
     #import os
     #print (os.environ['PYTHONPATH'])
-    cv2.destroyAllWindows()
+    cv2.destroyAllWindows()

samples/python/turing.py

@@ -69,6 +69,6 @@ if __name__ == '__main__':
         vis = a.copy()
         draw_str(vis, (20, 20), 'frame %d' % frame_i)
         cv2.imshow('a', vis)
-        if 0xFF & cv2.waitKey(5) == 27:
+        if cv2.waitKey(5) == 27:
             break
     cv2.destroyAllWindows()

samples/python/tutorial_code/core/mat_mask_operations/mat_mask_operations.py

@@ -0,0 +1,57 @@
+import time
+import numpy as np
+import cv2
+## [basic_method]
+def sharpen(my_image):
+    my_image = cv2.cvtColor(my_image, cv2.CV_8U)
+
+    height, width, n_channels = my_image.shape
+    result = np.zeros(my_image.shape, my_image.dtype)
+
+    ## [basic_method_loop]
+    for j in range  (1, height-1):
+        for i in range  (1, width-1):
+            for k in range  (0, n_channels):
+                sum = 5 * my_image[j, i, k] - my_image[j + 1, i, k] - my_image[j - 1, i, k]\
+                     - my_image[j, i + 1, k] - my_image[j, i - 1, k];
+
+                if sum > 255:
+                    sum = 255
+                if sum < 0:
+                    sum = 0
+
+                result[j, i, k] = sum
+    ## [basic_method_loop]
+
+    return result
+## [basic_method]
+
+
+I = cv2.imread("../data/lena.jpg")
+cv2.imshow('Input Image', I)
+
+t = round(time.time())
+J = sharpen(I)
+t = (time.time() - t)/1000
+print "Hand written function times passed in seconds: %s" % t
+
+cv2.imshow('Output Image', J)
+
+t = time.time()
+## [kern]
+kernel = np.array([ [0,-1,0],
+                    [-1,5,-1],
+                    [0,-1,0] ],np.float32) # kernel should be floating point type
+## [kern]
+
+## [filter2D]
+K = cv2.filter2D(I, -1, kernel) # ddepth = -1, means destination image has depth same as input image.
+## [filter2D]
+
+t = (time.time() - t)/1000
+print "Built-in filter2D time passed in seconds:      %s" % t
+
+cv2.imshow('filter2D Output Image', K)
+
+cv2.waitKey(0)
+cv2.destroyAllWindows()

samples/python/tutorial_code/introduction/documentation/documentation.py

@@ -0,0 +1,5 @@
+print('Not showing this text because it is outside the snippet')
+
+## [hello_world]
+print('Hello world!')
+## [hello_world]

samples/python/video.py

@@ -217,7 +217,7 @@ if __name__ == '__main__':
             ret, img = cap.read()
             imgs.append(img)
             cv2.imshow('capture %d' % i, img)
-        ch = 0xFF & cv2.waitKey(1)
+        ch = cv2.waitKey(1)
         if ch == 27:
             break
         if ch == ord(' '):

samples/python/video_threaded.py

@@ -81,7 +81,7 @@ if __name__ == '__main__':
             else:
                 task = DummyTask(process_frame(frame, t))
             pending.append(task)
-        ch = 0xFF & cv2.waitKey(1)
+        ch = cv2.waitKey(1)
         if ch == ord(' '):
             threaded_mode = not threaded_mode
         if ch == 27:

samples/python/video_v4l2.py

@@ -58,10 +58,10 @@ while True:
     cv2.putText(img, "FPS: {}".format(fps), (15, 80), font, 1.0, color)
     cv2.imshow("Video", img)
 
-    k = 0xFF & cv2.waitKey(1)
+    k = cv2.waitKey(1)
 
     if k == 27:
         break
-    elif k == ord("g"):
+    elif k == ord('g'):
         convert_rgb = not convert_rgb
         cap.set(cv2.CAP_PROP_CONVERT_RGB, convert_rgb)

samples/python/watershed.py

@@ -56,7 +56,7 @@ class App:
 
     def run(self):
         while cv2.getWindowProperty('img', 0) != -1 or cv2.getWindowProperty('watershed', 0) != -1:
-            ch = 0xFF & cv2.waitKey(50)
+            ch = cv2.waitKey(50)
             if ch == 27:
                 break
             if ch >= ord('1') and ch <= ord('7'):

samples/tapi/ufacedetect.cpp

@@ -78,9 +78,9 @@ int main( int argc, const char** argv )
 
     if( inputName.empty() || (isdigit(inputName[0]) && inputName.size() == 1) )
     {
-        int c = inputName.empty() ? 0 : inputName[0] - '0';
-        if(!capture.open(c))
-            cout << "Capture from camera #" <<  c << " didn't work" << endl;
+        int camera = inputName.empty() ? 0 : inputName[0] - '0';
+        if(!capture.open(camera))
+            cout << "Capture from camera #" <<  camera << " didn't work" << endl;
     }
     else
     {
@@ -105,7 +105,7 @@ int main( int argc, const char** argv )
 
             detectAndDraw( frame, canvas, cascade, nestedCascade, scale, tryflip );
 
-            int c = waitKey(10);
+            char c = (char)waitKey(10);
             if( c == 27 || c == 'q' || c == 'Q' )
                 break;
         }
@@ -128,7 +128,7 @@ int main( int argc, const char** argv )
                 char buf[1000+1];
                 while( fgets( buf, 1000, f ) )
                 {
-                    int len = (int)strlen(buf), c;
+                    int len = (int)strlen(buf);
                     while( len > 0 && isspace(buf[len-1]) )
                         len--;
                     buf[len] = '\0';
@@ -137,7 +137,7 @@ int main( int argc, const char** argv )
                     if( !image.empty() )
                     {
                         detectAndDraw( image, canvas, cascade, nestedCascade, scale, tryflip );
-                        c = waitKey(0);
+                        char c = (char)waitKey(0);
                         if( c == 27 || c == 'q' || c == 'Q' )
                             break;
                     }