Merged the trunk r8291:8321

CMakeLists.txt

@@ -113,7 +113,7 @@ OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF
 OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
 OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON   IF (NOT IOS) )
 OCV_OPTION(WITH_OPENEXR        "Include ILM support via OpenEXR"             ON   IF (NOT IOS) )
-OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID AND NOT IOS AND NOT APPLE) )
 OCV_OPTION(WITH_OPENNI         "Include OpenNI support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_PNG            "Include PNG support"                         ON   IF (NOT IOS) )
 OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (UNIX AND NOT ANDROID AND NOT IOS) )

cmake/OpenCVDetectCUDA.cmake

+if(${CMAKE_VERSION} VERSION_LESS "2.8.3")
+  message(STATUS WITH_CUDA flag requires CMake 2.8.3. CUDA support is disabled.)
+  return()  
+endif()
+  
 find_package(CUDA 4.1)
 
 if(CUDA_FOUND)

cmake/OpenCVGenConfig.cmake

@@ -23,7 +23,7 @@ else()
   set(OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE "${ANDROID_NATIVE_API_LEVEL}")
 endif()
 
-if(MSVC OR CMAKE_GENERATOR MATCHES Xcode)
+if(CMAKE_GENERATOR MATCHES "Visual" OR CMAKE_GENERATOR MATCHES "Xcode")
   set(OpenCV_ADD_DEBUG_RELEASE_CONFIGCMAKE TRUE)
 else()
   set(OpenCV_ADD_DEBUG_RELEASE_CONFIGCMAKE FALSE)

modules/core/src/matrix.cpp

@@ -1352,7 +1352,7 @@ void _OutputArray::create(int dims, const int* size, int type, int i, bool allow
             if(CV_MAT_CN(type) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0 )
                 type = m.type();
             else
-                CV_Assert(!fixedType() || (CV_MAT_CN(type) == m.channels() && ((1 << CV_MAT_TYPE(flags)) & fixedDepthMask) != 0));
+                CV_Assert(CV_MAT_TYPE(type) == m.type());
         }
         if(fixedSize())
         {

modules/core/test/test_arithm.cpp

@@ -1504,6 +1504,14 @@ protected:
                 d.convertTo(d1, depth);
                 CV_Assert( norm(c, d1, CV_C) <= DBL_EPSILON );
             }
+            
+            Mat_<uchar> tmpSrc(100,100);
+            tmpSrc = 124;
+            Mat_<uchar> tmpMask(100,100);
+            tmpMask = 255;
+            Mat_<uchar> tmpDst(100,100);
+            tmpDst = 2;
+            tmpSrc.copyTo(tmpDst,tmpMask);
         }
         catch(...)
         {

modules/ts/misc/run.py

@@ -601,7 +601,7 @@ class RunInfo(object):
             logfile = userlog[0][userlog[0].find(":")+1:]
         
         if self.targetos == "android" and exe.endswith(".apk"):
-            print "running", exe
+            print "running java tests:", exe
             try:
                 # get package info
                 output = Popen(self.aapt + ["dump", "xmltree", exe, "AndroidManifest.xml"], stdout=PIPE, stderr=_stderr).communicate()
@@ -614,14 +614,14 @@ class RunInfo(object):
                 if not manifest_tag:
                     print >> _stderr, "failed to get manifest info from", exe
                     return
-                pkg_name =  re.search(r"^[ ]+A: package=\"(?P<pkg>.*?)\" \(Raw: \"(?P=pkg)\"\)$", manifest_tag[0], flags=re.MULTILINE).group("pkg")
+                pkg_name =  re.search(r"^[ ]+A: package=\"(?P<pkg>.*?)\" \(Raw: \"(?P=pkg)\"\)\r?$", manifest_tag[0], flags=re.MULTILINE).group("pkg")
                 #get test instrumentation info
                 instrumentation_tag = [t for t in tags if t.startswith("instrumentation ")]
                 if not instrumentation_tag:
                     print >> _stderr, "can not find instrumentation detials in", exe
                     return
-                pkg_runner = re.search(r"^[ ]+A: android:name\(0x[0-9a-f]{8}\)=\"(?P<runner>.*?)\" \(Raw: \"(?P=runner)\"\)$", instrumentation_tag[0], flags=re.MULTILINE).group("runner")
-                pkg_target =  re.search(r"^[ ]+A: android:targetPackage\(0x[0-9a-f]{8}\)=\"(?P<pkg>.*?)\" \(Raw: \"(?P=pkg)\"\)$", instrumentation_tag[0], flags=re.MULTILINE).group("pkg")
+                pkg_runner = re.search(r"^[ ]+A: android:name\(0x[0-9a-f]{8}\)=\"(?P<runner>.*?)\" \(Raw: \"(?P=runner)\"\)\r?$", instrumentation_tag[0], flags=re.MULTILINE).group("runner")
+                pkg_target =  re.search(r"^[ ]+A: android:targetPackage\(0x[0-9a-f]{8}\)=\"(?P<pkg>.*?)\" \(Raw: \"(?P=pkg)\"\)\r?$", instrumentation_tag[0], flags=re.MULTILINE).group("pkg")
                 if not pkg_name or not pkg_runner or not pkg_target:
                     print >> _stderr, "can not find instrumentation detials in", exe
                     return
@@ -632,14 +632,14 @@ class RunInfo(object):
                         pkg_target = self.options.junit_package
                 #uninstall already installed package
                 print >> _stderr, "Uninstalling old", pkg_name, "from device..."
-                output = Popen(self.adb + ["uninstall", pkg_name], stdout=_stdout, stderr=_stderr).wait()
-                if output != 0:
-                    print >> _stderr, "failed to uninstall", pkg_name, "from device"
-                    return
-                print >> _stderr, "Installing new", exe, "to device..."
-                output = Popen(self.adb + ["install", exe], stdout=_stdout, stderr=_stderr).wait()
-                if output != 0:
-                    print >> _stderr, "failed to install", exe, "to device"
+                Popen(self.adb + ["uninstall", pkg_name], stdout=PIPE, stderr=_stderr).communicate()
+                print >> _stderr, "Installing new", exe, "to device...",
+                output = Popen(self.adb + ["install", exe], stdout=PIPE, stderr=PIPE).communicate()
+                if output[0] and output[0].strip().endswith("Success"):
+                    print >> _stderr, "Success"
+                else:
+                    print >> _stderr, "Failure"
+                    print >> _stderr, "Failed to install", exe, "to device"
                     return
                 print >> _stderr, "Running jUnit tests for ", pkg_target
                 if self.setUp is not None: