Merge pull request opencv#5282 from mshabunin:mingw-51

alalek · alalek · commit 9c3f95782d09 · 2015-09-02T13:19:52.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,7 +171,7 @@ OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON
 OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"                              OFF )
 OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_GTK_2_X        "Use GTK version 2"                           OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
-OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   ON   IF (X86_64 OR X86) AND NOT WINRT)
+OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   NOT MINGW IF (X86_64 OR X86) AND NOT WINRT )
 OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
 OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON)
 OCV_OPTION(WITH_WEBP           "Include WebP support"                        ON   IF (NOT IOS AND NOT WINRT) )
diff --git a/modules/core/include/opencv2/core/base.hpp b/modules/core/include/opencv2/core/base.hpp
@@ -271,7 +271,7 @@ enum BorderTypes {
 #  endif
 #endif
 #ifndef CV_StaticAssert
-#  if defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC_MINOR__ > 2)
+#  if !defined(__clang__) && defined(__GNUC__) && (__GNUC__*100 + __GNUC_MINOR__ > 302)
 #    define CV_StaticAssert(condition, reason) ({ extern int __attribute__((error("CV_StaticAssert: " reason " " #condition))) CV_StaticAssert(); ((condition) ? 0 : CV_StaticAssert()); })
 #  else
      template <bool x> struct CV_StaticAssert_failed;
@@ -296,7 +296,7 @@ enum BorderTypes {
     CV_DO_PRAGMA(warning(push)) \
     CV_DO_PRAGMA(warning(disable: 4996))
 #define CV_SUPPRESS_DEPRECATED_END CV_DO_PRAGMA(warning(pop))
-#elif defined (__clang__) || ((__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+#elif defined (__clang__) || ((__GNUC__)  && (__GNUC__*100 + __GNUC_MINOR__ > 405))
 #define CV_SUPPRESS_DEPRECATED_START \
     CV_DO_PRAGMA(GCC diagnostic push) \
     CV_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-declarations")
diff --git a/modules/core/include/opencv2/core/cuda.inl.hpp b/modules/core/include/opencv2/core/cuda.inl.hpp
@@ -578,15 +578,15 @@ int DeviceInfo::deviceID() const
 inline
 size_t DeviceInfo::freeMemory() const
 {
-    size_t _totalMemory, _freeMemory;
+    size_t _totalMemory = 0, _freeMemory = 0;
     queryMemory(_totalMemory, _freeMemory);
     return _freeMemory;
 }
 
 inline
 size_t DeviceInfo::totalMemory() const
 {
-    size_t _totalMemory, _freeMemory;
+    size_t _totalMemory = 0, _freeMemory = 0;
     queryMemory(_totalMemory, _freeMemory);
     return _totalMemory;
 }
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -1191,6 +1191,9 @@ TLSData<CoreTLSData>& getCoreTlsData()
     #pragma warning(disable:4447) // Disable warning 'main' signature found without threading model
 #endif
 
+extern "C"
+BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved);
+
 extern "C"
 BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved)
 {
diff --git a/modules/cudalegacy/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp b/modules/cudalegacy/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
@@ -69,7 +69,7 @@
 // Guaranteed size cross-platform classifier structures
 //
 //==============================================================================
-#if defined __GNUC__ && __GNUC__ > 2 && __GNUC_MINOR__  > 4
+#if defined __GNUC__ && (__GNUC__*100 + __GNUC_MINOR__ > 204)
 typedef Ncv32f __attribute__((__may_alias__)) Ncv32f_a;
 #else
 typedef Ncv32f Ncv32f_a;
@@ -208,7 +208,7 @@ struct HaarClassifierNodeDescriptor32
     }
 };
 
-#if defined __GNUC__ && __GNUC__ > 2 && __GNUC_MINOR__  > 4
+#if defined __GNUC__ && (__GNUC__*100 + __GNUC_MINOR__ > 204)
 typedef Ncv32u __attribute__((__may_alias__)) Ncv32u_a;
 #else
 typedef Ncv32u Ncv32u_a;
diff --git a/modules/cudalegacy/src/cuda/NPP_staging.cu b/modules/cudalegacy/src/cuda/NPP_staging.cu
@@ -1593,7 +1593,7 @@ NCVStatus nppsStCompact_32s(Ncv32s *d_src, Ncv32u srcLen,
 }
 
 
-#if defined __GNUC__ && __GNUC__ > 2 && __GNUC_MINOR__  > 4
+#if defined __GNUC__ && (__GNUC__*100 + __GNUC_MINOR__ > 204)
 typedef Ncv32u __attribute__((__may_alias__)) Ncv32u_a;
 #else
 typedef Ncv32u Ncv32u_a;
diff --git a/modules/features2d/src/agast.cpp b/modules/features2d/src/agast.cpp
@@ -45,7 +45,7 @@ The references are:
 #include "precomp.hpp"
 #include "agast_score.hpp"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning( disable : 4127 )
 #endif
 
diff --git a/modules/features2d/src/agast_score.cpp b/modules/features2d/src/agast_score.cpp
@@ -44,7 +44,7 @@ The references are:
 
 #include "agast_score.hpp"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning( disable : 4127 )
 #endif
 
diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp
@@ -2036,8 +2036,8 @@ icvCreateTrackbar( const char* trackbar_name, const char* window_name,
     trackbar = icvFindTrackbarByName(window,trackbar_name);
     if( !trackbar )
     {
-        TBBUTTON tbs = {0};
-        TBBUTTONINFO tbis = {0};
+        TBBUTTON tbs = {};
+        TBBUTTONINFO tbis = {};
         RECT rect;
         int bcount;
         int len = (int)strlen( trackbar_name );
diff --git a/modules/imgcodecs/src/grfmt_jpeg.cpp b/modules/imgcodecs/src/grfmt_jpeg.cpp
@@ -213,7 +213,7 @@ ImageDecoder JpegDecoder::newDecoder() const
 
 bool  JpegDecoder::readHeader()
 {
-    bool result = false;
+    volatile bool result = false;
     close();
 
     JpegState* state = new JpegState;
diff --git a/modules/imgcodecs/src/grfmt_png.cpp b/modules/imgcodecs/src/grfmt_png.cpp
@@ -140,7 +140,7 @@ void  PngDecoder::readDataFromBuf( void* _png_ptr, uchar* dst, size_t size )
 
 bool  PngDecoder::readHeader()
 {
-    bool result = false;
+    volatile bool result = false;
     close();
 
     png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, 0, 0, 0 );
diff --git a/modules/imgproc/src/hough.cpp b/modules/imgproc/src/hough.cpp
@@ -1,4 +1,4 @@
-﻿/*M///////////////////////////////////////////////////////////////////////////////////////
+/*M///////////////////////////////////////////////////////////////////////////////////////
 //
 //  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
 //
diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp
@@ -93,6 +93,11 @@ Thanks to:
 #pragma warning(disable: 4995)
 #endif
 
+#ifdef __MINGW32__
+// MinGW does not understand COM interfaces
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
 #include <tchar.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py
@@ -10,16 +10,16 @@ def __init__(self, text=None):
     def __str__(self):
         return "ERROR" if self.t is None else self.t
 
-def execute(cmd):
+def execute(cmd, shell=False):
     try:
         log.info("Executing: %s" % cmd)
-        retcode = subprocess.call(cmd)
+        retcode = subprocess.call(cmd, shell=shell)
         if retcode < 0:
             raise Fail("Child was terminated by signal:" %s -retcode)
         elif retcode > 0:
             raise Fail("Child returned: %s" % retcode)
     except OSError as e:
-        raise Fail("Execution failed: %s" % e)
+        raise Fail("Execution failed: %d / %s" % (e.errno, e.strerror))
 
 def rm_one(d):
     d = os.path.abspath(d)
@@ -169,18 +169,23 @@ def build_engine(self, abi, engdest):
         for ver, d in self.extra_packs + [("3.0.0", os.path.join(self.libdest, "lib"))]:
             r = ET.Element("library", attrib={"version": ver})
             log.info("Adding libraries from %s", d)
+
             for f in glob.glob(os.path.join(d, abi.name, "*.so")):
                 log.info("Copy file: %s", f)
                 shutil.copy2(f, apklibdest)
                 if "libnative_camera" in f:
                     continue
                 log.info("Register file: %s", os.path.basename(f))
                 n = ET.SubElement(r, "file", attrib={"name": os.path.basename(f)})
-            xmlname = os.path.join(apkxmldest, "config%s.xml" % ver.replace(".", ""))
-            log.info("Generating XML config: %s", xmlname)
-            ET.ElementTree(r).write(xmlname, encoding="utf-8")
+
+            if len(list(r)) > 0:
+                xmlname = os.path.join(apkxmldest, "config%s.xml" % ver.replace(".", ""))
+                log.info("Generating XML config: %s", xmlname)
+                ET.ElementTree(r).write(xmlname, encoding="utf-8")
+
         execute(["ninja", "opencv_engine"])
-        execute(["ant", "-f", os.path.join(apkdest, "build.xml"), "debug"])
+        execute(["ant", "-f", os.path.join(apkdest, "build.xml"), "debug"],
+            shell=(sys.platform == 'win32'))
         # TODO: Sign apk
 
     def build_javadoc(self):
@@ -278,12 +283,13 @@ def gather_results(self, engines):
     log.info("Detected OpenCV version: %s", builder.opencv_version)
     log.info("Detected Engine version: %s", builder.engine_version)
 
-    for one in args.extra_pack:
-        i = one.find(":")
-        if i > 0 and i < len(one) - 1:
-            builder.add_extra_pack(one[:i], one[i+1:])
-        else:
-            raise Fail("Bad extra pack provided: %s, should be in form '<version>:<path-to-native-libs>'" % one)
+    if args.extra_pack:
+        for one in args.extra_pack:
+            i = one.find(":")
+            if i > 0 and i < len(one) - 1:
+                builder.add_extra_pack(one[:i], one[i+1:])
+            else:
+                raise Fail("Bad extra pack provided: %s, should be in form '<version>:<path-to-native-libs>'" % one)
 
     engines = []
     for i, abi in enumerate(ABIs):

Original file line number	Diff line number	Diff line change
`@@ -578,15 +578,15 @@ int DeviceInfo::deviceID() const`
`578`	`578`	`inline`
`579`	`579`	`size_t DeviceInfo::freeMemory() const`
`580`	`580`	`{`
`581`		`- size_t _totalMemory, _freeMemory;`
	`581`	`+ size_t _totalMemory = 0, _freeMemory = 0;`
`582`	`582`	`queryMemory(_totalMemory, _freeMemory);`
`583`	`583`	`return _freeMemory;`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`inline`
`587`	`587`	`size_t DeviceInfo::totalMemory() const`
`588`	`588`	`{`
`589`		`- size_t _totalMemory, _freeMemory;`
	`589`	`+ size_t _totalMemory = 0, _freeMemory = 0;`
`590`	`590`	`queryMemory(_totalMemory, _freeMemory);`
`591`	`591`	`return _totalMemory;`
`592`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1191,6 +1191,9 @@ TLSData<CoreTLSData>& getCoreTlsData()`
`1191`	`1191`	`#pragma warning(disable:4447) // Disable warning 'main' signature found without threading model`
`1192`	`1192`	`#endif`
`1193`	`1193`
	`1194`	`+extern "C"`
	`1195`	`+BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved);`
	`1196`	`+`
`1194`	`1197`	`extern "C"`
`1195`	`1198`	`BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID lpReserved)`
`1196`	`1199`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1593,7 +1593,7 @@ NCVStatus nppsStCompact_32s(Ncv32s *d_src, Ncv32u srcLen,`
`1593`	`1593`	`}`
`1594`	`1594`
`1595`	`1595`
`1596`		`-#if defined __GNUC__ && __GNUC__ > 2 && __GNUC_MINOR__ > 4`
	`1596`	`+#if defined __GNUC__ && (__GNUC__*100 + __GNUC_MINOR__ > 204)`
`1597`	`1597`	`typedef Ncv32u __attribute__((__may_alias__)) Ncv32u_a;`
`1598`	`1598`	`#else`
`1599`	`1599`	`typedef Ncv32u Ncv32u_a;`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ ImageDecoder JpegDecoder::newDecoder() const`
`213`	`213`
`214`	`214`	`bool JpegDecoder::readHeader()`
`215`	`215`	`{`
`216`		`- bool result = false;`
	`216`	`+ volatile bool result = false;`
`217`	`217`	`close();`
`218`	`218`
`219`	`219`	`JpegState* state = new JpegState;`