Merge release 2.4.3

modules/highgui/doc/reading_and_writing_images_and_video.rst

@@ -75,11 +75,11 @@ Loads an image from a file.
 
     :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.

modules/highgui/perf/perf_input.cpp

@@ -6,6 +6,8 @@ using namespace perf;
 using std::tr1::make_tuple;
 using std::tr1::get;
 
+#ifndef ANDROID
+
 typedef perf::TestBaseWithParam<String> VideoCapture_Reading;
 
 PERF_TEST_P(VideoCapture_Reading, ReadFile, testing::Values( "highgui/video/big_buck_bunny.avi",
@@ -23,3 +25,5 @@ PERF_TEST_P(VideoCapture_Reading, ReadFile, testing::Values( "highgui/video/big_
   bool dummy = cap.isOpened();
   SANITY_CHECK(dummy);
 }
+
+#endif //ANDROID

modules/highgui/perf/perf_output.cpp

@@ -6,6 +6,8 @@ using namespace perf;
 using std::tr1::make_tuple;
 using std::tr1::get;
 
+#ifndef ANDROID
+
 typedef std::tr1::tuple<String, bool> VideoWriter_Writing_t;
 typedef perf::TestBaseWithParam<VideoWriter_Writing_t> VideoWriter_Writing;
 
@@ -28,3 +30,5 @@ PERF_TEST_P(VideoWriter_Writing, WriteFrame,
   bool dummy = writer.isOpened();
   SANITY_CHECK(dummy);
 }
+
+#endif //ANDROID

modules/highgui/perf/perf_precomp.hpp

@@ -1,6 +1,9 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
+#  ifdef __clang__
+#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#    pragma GCC diagnostic ignored "-Wextra"
+#  endif
 #endif
 
 #ifndef __OPENCV_PERF_PRECOMP_HPP__

modules/highgui/src/precomp.hpp

@@ -49,11 +49,6 @@
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 
-#if defined WIN32 || defined _WIN32
-//required windows.h has to be included by the opencv2/core/internal.hpp
-void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -61,6 +56,14 @@ void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origi
 #include <ctype.h>
 #include <assert.h>
 
+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #ifdef HAVE_TEGRA_OPTIMIZATION
 #include "opencv2/highgui/highgui_tegra.hpp"
 #endif

modules/highgui/src/window_w32.cpp

@@ -106,7 +106,7 @@ static const char* trackbar_text =
 
 #endif
 
-void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
+static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
 {
     assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));
 

modules/highgui/test/test_precomp.hpp

@@ -1,6 +1,9 @@
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  pragma GCC diagnostic ignored "-Wmissing-prototypes" //OSX
+#  ifdef __clang__
+#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#    pragma GCC diagnostic ignored "-Wextra"
+#  endif
 #endif
 
 #ifndef __OPENCV_TEST_PRECOMP_HPP__

modules/highgui/test/test_video_io.cpp

@@ -143,7 +143,7 @@ void CV_HighGuiTest::ImageTest(const string& dir)
 #ifdef HAVE_JASPER
         "jp2",
 #endif
-#if defined HAVE_OPENEXR && !defined __APPLE__
+#if 0 /*defined HAVE_OPENEXR && !defined __APPLE__*/
         "exr",
 #endif
         "bmp",