back to 4.0.0, fix haarcascades path

skvark · skvark · commit 6851d5695815 · 2019-01-08T17:35:53.000+02:00
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit c9ad5779f2803dcc91a9938142209128d30b22d1
+Subproject commit 75ed282b20770a7a9b490102fd2e0b4fa26223e5
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 25221244732dcf44c1450d0f93edc2529a61c0e1
+Subproject commit d511587cf0bc782022db215d20d960afb2e9efe2
diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@ def main():
         ['python/cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}],
 
         'cv2.data': [  # OPENCV_OTHER_INSTALL_PATH
-            ('etc' if os.name == 'nt' else 'share/OpenCV') +
+            ('etc' if os.name == 'nt' else 'share/opencv4') +
             r'/haarcascades/.*\.xml'
         ]
     }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ def main():`
`83`	`83`	`['python/cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}],`
`84`	`84`
`85`	`85`	`'cv2.data': [ # OPENCV_OTHER_INSTALL_PATH`
`86`		`- ('etc' if os.name == 'nt' else 'share/OpenCV') +`
	`86`	`+ ('etc' if os.name == 'nt' else 'share/opencv4') +`
`87`	`87`	`r'/haarcascades/.*\.xml'`
`88`	`88`	`]`
`89`	`89`	`}`