Merge release 2.4.3

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/tutorials/highgui/video-input-psnr-ssim/video-input-psnr-ssim.rst
Simple merge

diff --cc modules/core/doc/operations_on_arrays.rst
Simple merge

diff --cc modules/core/src/algorithm.cpp
Simple merge

diff --cc modules/features2d/perf/perf_fast.cpp
index f550f7b,6ea0433..a779388
--- 1/modules/features2d/perf/perf_fast.cpp
--- 2/modules/features2d/perf/perf_fast.cpp
+++ b/modules/features2d/perf/perf_fast.cpp
@@@ -30,10 -30,14 +30,14 @@@ PERF_TEST_P(fast, detect, testing::Comb
  
      declare.in(frame);
  
-     FastFeatureDetector fd(20, true, type);
 -    Ptr<FeatureDetector> fd = Algorithm::create<FeatureDetector>("Feature2D.FASTX");
++    Ptr<FeatureDetector> fd = Algorithm::create<FeatureDetector>("Feature2D.FAST");
+     ASSERT_FALSE( fd == 0 );
+     fd->set("threshold", 20);
+     fd->set("nonmaxSuppression", true);
+     fd->set("type", type);
      vector<KeyPoint> points;
  
-     TEST_CYCLE() fd.detect(frame, points);
+     TEST_CYCLE() fd->detect(frame, points);
  
      SANITY_CHECK_KEYPOINTS(points);
  }

diff --cc modules/features2d/src/fast.cpp
Simple merge

diff --cc modules/highgui/doc/reading_and_writing_images_and_video.rst
index 5911b3f,b7f65f0..42e3eea
--- 1/modules/highgui/doc/reading_and_writing_images_and_video.rst
--- 2/modules/highgui/doc/reading_and_writing_images_and_video.rst
+++ b/modules/highgui/doc/reading_and_writing_images_and_video.rst
@@@ -74,12 -74,12 +74,12 @@@ Loads an image from a file
      :param filename: Name of file to be loaded.
  
      :param flags: Flags specifying the color type of a loaded image:
 -    
 +
-         * 1 -
-         * CV_LOAD_IMAGE_ANYDEPTH -
-         CV_LOAD_IMAGE_COLOR
-         CV_LOAD_IMAGE_GRAYSCALE
+         * CV_LOAD_IMAGE_ANYDEPTH - If set, return 16-bit/32-bit image when the input has the corresponding depth, otherwise convert it to 8-bit.
 -        
 +
+         * CV_LOAD_IMAGE_COLOR - If set, always convert image to the color one
+ 
+         * CV_LOAD_IMAGE_GRAYSCALE - If set, always convert image to the grayscale one
  
          * **>0**  Return a 3-channel color image.
              .. note:: In the current implementation the alpha channel, if any, is stripped from the output image. Use negative value if you need the alpha channel.

diff --cc samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
index be736b9,13ffc68..73a48a1
--- 1/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
--- 2/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
+++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
@@@ -162,12 -167,12 +167,12 @@@ public class ColorBlobDetectionActivit
              mDetector.process(mRgba);
              List<MatOfPoint> contours = mDetector.getContours();
              Log.e(TAG, "Contours count: " + contours.size());
--            Imgproc.drawContours(mRgba, contours, -1, CONTOUR_COLOR);
++            Core.drawContours(mRgba, contours, -1, CONTOUR_COLOR);
  
-             Mat colorLabel = mRgba.submat(2, 34, 2, 34);
+             Mat colorLabel = mRgba.submat(4, 68, 4, 68);
              colorLabel.setTo(mBlobColorRgba);
  
-             Mat spectrumLabel = mRgba.submat(2, 2 + mSpectrum.rows(), 38, 38 + mSpectrum.cols());
+             Mat spectrumLabel = mRgba.submat(4, 4 + mSpectrum.rows(), 70, 70 + mSpectrum.cols());
              mSpectrum.copyTo(spectrumLabel);
          }