Merge pull request #339 from thp/use-opencv-2

Use OpenCV 2.4 (Fixes #336)
thp · Dec 30, 2017 · 23a5705 · 23a5705
2 parents 963affd + b456090
commit 23a5705
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/macos/build-macos b/scripts/macos/build-macos
@@ -41,7 +41,7 @@ cd $PSMOVEAPI_CHECKOUT
 if [ ! -d $OPENCV_INSTALL_DIR ]; then
     cd external
     if [ ! -d opencv ]; then
-		git clone --depth 1 --branch 3.1.0 git://github.com/Itseez/opencv.git
+		git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
     fi
     cd opencv
 

diff --git a/scripts/mingw64/cross-compile b/scripts/mingw64/cross-compile
@@ -18,7 +18,7 @@ fi
 PSMOVEAPI_PLATFORM="$1"
 shift
 
-OPENCV_VERSION=3.1.0
+OPENCV_VERSION=2.4
 PSMOVEAPI_VERSION=$(git describe --tags)
 
 MAKE_ARGS="$@"
@@ -35,7 +35,7 @@ fi
 # Build OpenCV
 if [ ! -d external/opencv ]; then
     if [ ! -f ${OPENCV_VERSION}.zip ]; then
-        curl -O -L https://github.com/Itseez/opencv/archive/${OPENCV_VERSION}.zip
+        curl -O -L https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip
     fi
     unzip ${OPENCV_VERSION}.zip
     mv opencv-${OPENCV_VERSION} external/opencv

diff --git a/scripts/visualc/build_msvc.bat b/scripts/visualc/build_msvc.bat
@@ -56,7 +56,7 @@ IF !ERRORLEVEL! NEQ 0 (
 REM Clone OpenCV
 IF NOT EXIST %OPENCV_DIR% (
 	cd %PSMOVE_API_EXTERNAL_DIR%
-	git clone --depth 1 --branch 3.1.0 git://github.com/Itseez/opencv.git
+	git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
 ) ELSE (
 	echo.
 	echo OpenCV dir already exists; assuming it has been cloned already