added a few missing images for tutorials; integrated pull request #26

diff --git a/3rdparty/libjasper/CMakeLists.txt b/3rdparty/libjasper/CMakeLists.txt
index 0478ef9..a6fb71e 100644 (file)
--- a/3rdparty/libjasper/CMakeLists.txt
+++ b/3rdparty/libjasper/CMakeLists.txt
@@ -19,9 +19,9 @@ file(GLOB lib_ext_hdrs jasper/*.h)
 
 add_library(${JASPER_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs} ${lib_ext_hdrs})
 
-if(MSVC)
+if(WIN32 AND NOT MINGW)
   add_definitions(-DJAS_WIN_MSVC_BUILD)
-endif()
+endif(WIN32 AND NOT MINGW)
 
 ocv_warnings_disable(CMAKE_C_FLAGS -Wno-implicit-function-declaration -Wno-uninitialized -Wmissing-prototypes -Wmissing-declarations -Wunused -Wshadow -Wsign-compare)
 ocv_warnings_disable(CMAKE_C_FLAGS /wd4013 /wd4018 /wd4101 /wd4244 /wd4267 /wd4715) # vs2005

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9baf67..b644212 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,9 +337,12 @@ include(cmake/OpenCVCompilerOptions.cmake REQUIRED)
 # ----------------------------------------------------------------------------
 if(MSVC)
   include(cmake/OpenCVCRTLinkage.cmake REQUIRED)
-  add_definitions(-D_VARIADIC_MAX=10)
 endif(MSVC)
 
+if(WIN32 AND NOT MINGW)
+  add_definitions(-D_VARIADIC_MAX=10)
+endif(WIN32 AND NOT MINGW)
+
 
 # ----------------------------------------------------------------------------
 #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..

diff --git a/doc/tutorials/ios/hello/images/header_directive.png b/doc/tutorials/ios/hello/images/header_directive.png
new file mode 100644 (file)
index 0000000..7e41e0b
Binary files /dev/null and b/doc/tutorials/ios/hello/images/header_directive.png differ

diff --git a/doc/tutorials/ios/hello/images/linking_opencv_ios.png b/doc/tutorials/ios/hello/images/linking_opencv_ios.png
new file mode 100644 (file)
index 0000000..cf82caf
Binary files /dev/null and b/doc/tutorials/ios/hello/images/linking_opencv_ios.png differ

diff --git a/doc/tutorials/ios/hello/images/output.png b/doc/tutorials/ios/hello/images/output.png
new file mode 100644 (file)
index 0000000..13d9433
Binary files /dev/null and b/doc/tutorials/ios/hello/images/output.png differ

diff --git a/doc/tutorials/ios/hello/images/view_did_load.png b/doc/tutorials/ios/hello/images/view_did_load.png
new file mode 100644 (file)
index 0000000..6573b1d
Binary files /dev/null and b/doc/tutorials/ios/hello/images/view_did_load.png differ

diff --git a/doc/tutorials/ios/image_manipulation/images/output.jpg b/doc/tutorials/ios/image_manipulation/images/output.jpg
new file mode 100644 (file)
index 0000000..5f55233
Binary files /dev/null and b/doc/tutorials/ios/image_manipulation/images/output.jpg differ

diff --git a/modules/gpu/perf/perf_calib3d.cpp b/modules/gpu/perf/perf_calib3d.cpp
index f62185e..274e1d8 100644 (file)
--- a/modules/gpu/perf/perf_calib3d.cpp
+++ b/modules/gpu/perf/perf_calib3d.cpp
@@ -11,7 +11,16 @@ namespace {
 typedef pair<string, string> pair_string;\r
 DEF_PARAM_TEST_1(ImagePair, pair_string);\r
 \r
-PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(make_pair<string, string>("gpu/perf/aloe.jpg", "gpu/perf/aloeR.jpg")))\r
+static pair_string make_string_pair(const string& a, const string& b)\r
+{\r
+#ifdef _MSC_VER    \r
+    return pair<string, string>(a, b);\r
+#else\r
+    return make_pair<string, string>(a, b);\r
+#endif    \r
+}\r
+\r
+PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(make_string_pair("gpu/perf/aloe.jpg", "gpu/perf/aloeR.jpg")))\r
 {\r
     declare.time(5.0);\r
 \r
@@ -57,7 +66,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBM, Values(make_pair<string, string>("gpu/p
 //////////////////////////////////////////////////////////////////////\r
 // StereoBeliefPropagation\r
 \r
-PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(make_pair<string, string>("gpu/stereobp/aloe-L.png", "gpu/stereobp/aloe-R.png")))\r
+PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(make_string_pair("gpu/stereobp/aloe-L.png", "gpu/stereobp/aloe-R.png")))\r
 {\r
     declare.time(10.0);\r
 \r
@@ -93,7 +102,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoBeliefPropagation, Values(make_pair<string,
 //////////////////////////////////////////////////////////////////////\r
 // StereoConstantSpaceBP\r
 \r
-PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(make_pair<string, string>("gpu/stereobm/aloe-L.png", "gpu/stereobm/aloe-R.png")))\r
+PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(make_string_pair("gpu/stereobm/aloe-L.png", "gpu/stereobm/aloe-R.png")))\r
 {\r
     declare.time(10.0);\r
 \r
@@ -129,7 +138,7 @@ PERF_TEST_P(ImagePair, Calib3D_StereoConstantSpaceBP, Values(make_pair<string, s
 //////////////////////////////////////////////////////////////////////\r
 // DisparityBilateralFilter\r
 \r
-PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(make_pair<string, string>("gpu/stereobm/aloe-L.png", "gpu/stereobm/aloe-disp.png")))\r
+PERF_TEST_P(ImagePair, Calib3D_DisparityBilateralFilter, Values(make_string_pair("gpu/stereobm/aloe-L.png", "gpu/stereobm/aloe-disp.png")))\r
 {\r
     const cv::Mat img = readImage(GetParam().first, cv::IMREAD_GRAYSCALE);\r
     ASSERT_FALSE(img.empty());\r

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index d53c17c..7a57b09 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -107,6 +107,7 @@ endif()
 
 if(WIN32)
   list(APPEND highgui_srcs src/cap_vfw.cpp src/cap_cmu.cpp src/cap_dshow.cpp)
+  list(APPEND HIGHGUI_LIBRARIES vfw32)
 endif(WIN32)
 
 if(HAVE_XINE)