back to 4.0.0, fix haarcascades path

6851d569 · Olli-Pekka Heinisuo · 11e30d50 · 75ed282b · c9ad5779 · 75ed282b
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

opencv opencv +1 -1

opencv_contrib opencv_contrib +1 -1

setup.py setup.py +1 -1

未找到文件。
--- a/opencv @ 75ed282b
+++ b/opencv @ 75ed282b
-Subproject commit c9ad5779f2803dcc91a9938142209128d30b22d1
+Subproject commit 75ed282b20770a7a9b490102fd2e0b4fa26223e5
--- a/opencv_contrib @ d511587c
+++ b/opencv_contrib @ d511587c
-Subproject commit 25221244732dcf44c1450d0f93edc2529a61c0e1
+Subproject commit d511587cf0bc782022db215d20d960afb2e9efe2
--- 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'
        ]
    }