Peter M. Groen / openbr

Commit 44cdf3bb51a2f54f637dbd66088ac43da90ca4c7

Authored by jklontz
2 parents bea9d765 2d023be5

Merge pull request #20 from biometrics/opencv_2.4.4 

Opencv 2.4.4
Inline Side-by-side
Showing 5 changed files with 26 additions and 30 deletions
CMakeLists.txt
  View file @44cdf3b
@@ -39,8 +39,6 @@ endif() @@ -39,8 +39,6 @@ endif()
39 if(WIN32) 39 if(WIN32)
40 configure_file(${BR_SHARE_DIR}/resources.rc.in resources.rc) 40 configure_file(${BR_SHARE_DIR}/resources.rc.in resources.rc)
41 set(BR_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources.rc) 41 set(BR_RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/resources.rc)
42 -elseif(APPLE)  
43 - set(BR_RESOURCES ${NATIVE_ICON})  
44 endif() 42 endif()
45 43
46 # Build options 44 # Build options
app/examples/CMakeLists.txt
  View file @44cdf3b
@@ -5,5 +5,5 @@ foreach(EXAMPLE ${EXAMPLES}) @@ -5,5 +5,5 @@ foreach(EXAMPLE ${EXAMPLES})
5 qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES}) 5 qt5_use_modules(${EXAMPLE_BASENAME} ${QT_DEPENDENCIES})
6 target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS}) 6 target_link_libraries(${EXAMPLE_BASENAME} openbr ${BR_THIRDPARTY_LIBS})
7 install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin) 7 install(TARGETS ${EXAMPLE_BASENAME} RUNTIME DESTINATION bin)
8 - add_test("${EXAMPLE_BASENAME}_test" ${EXAMPLE_BASENAME}) 8 + add_test(NAME ${EXAMPLE_BASENAME}_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${EXAMPLE_BASENAME})
9 endforeach() 9 endforeach()
app/openbr-gui/CMakeLists.txt
  View file @44cdf3b
@@ -13,7 +13,6 @@ if(NOT ${BR_EMBEDDED}) @@ -13,7 +13,6 @@ if(NOT ${BR_EMBEDDED})
13 SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} 13 SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
14 LINK_INTERFACE_LIBRARIES "") 14 LINK_INTERFACE_LIBRARIES "")
15 target_link_libraries(openbr-gui openbr ${OpenCV_LIBS}) 15 target_link_libraries(openbr-gui openbr ${OpenCV_LIBS})
16 - add_cppcheck(openbr-gui)  
17 16
18 install(FILES ${HEADERS} DESTINATION include/openbr-gui) 17 install(FILES ${HEADERS} DESTINATION include/openbr-gui)
19 install(TARGETS openbr-gui RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) 18 install(TARGETS openbr-gui RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
sdk/openbr_export.cpp
  View file @44cdf3b
@@ -84,13 +84,12 @@ $ br -help @@ -84,13 +84,12 @@ $ br -help
84 * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>. 84 * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>.
85 * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. 85 * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install.
86 * -# During installation setup select "add CMake to PATH". 86 * -# During installation setup select "add CMake to PATH".
87 - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and unarchive. 87 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
88 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs. 88 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs.
89 - * -# Move the "OpenCV-2.4.3" folder to "C:\".  
90 - * -# In "C:\OpenCV-2.4.3\modules\objdetect\src\haar.cpp" line 55, change "#ifdev CV_AVX" to "#ifdef 0". 89 + * -# Move the "OpenCV-2.4.4" folder to "C:\".
91 * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter: 90 * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter:
92 * \code 91 * \code
93 - * $ cd C:\OpenCV-2.4.3 92 + * $ cd C:\OpenCV-2.4.4
94 * $ mkdir build-msvc2012 93 * $ mkdir build-msvc2012
95 * $ cd build-msvc2012 94 * $ cd build-msvc2012
96 * $ cmake -G "NMake Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug .. 95 * $ cmake -G "NMake Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug ..
@@ -129,7 +128,7 @@ $ br -help @@ -129,7 +128,7 @@ $ br -help
129 * $ cd C:\openbr 128 * $ cd C:\openbr
130 * $ mkdir build-msvc2012 129 * $ mkdir build-msvc2012
131 * $ cd build-msvc2012 130 * $ cd build-msvc2012
132 - * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. 131 + * $ cmake -G "CodeBlocks - NMake Makefiles" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release ..
133 * $ nmake 132 * $ nmake
134 * $ nmake install 133 * $ nmake install
135 * \endcode 134 * \endcode
@@ -164,12 +163,12 @@ $ br -help @@ -164,12 +163,12 @@ $ br -help
164 * -# Move "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\". 163 * -# Move "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\".
165 * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. 164 * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install.
166 * -# During installation setup select "add CMake to PATH". 165 * -# During installation setup select "add CMake to PATH".
167 - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a> and unarchive. 166 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
168 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs. 167 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs.
169 - * -# Move the "OpenCV-2.4.3" folder to "C:\". 168 + * -# Move the "OpenCV-2.4.4" folder to "C:\".
170 * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"): 169 * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"):
171 * \code 170 * \code
172 - * $ cd C:\OpenCV-2.4.3 171 + * $ cd C:\OpenCV-2.4.4
173 * $ mkdir build-mingw64 172 * $ mkdir build-mingw64
174 * $ cd build-mingw64 173 * $ cd build-mingw64
175 * $ cmake -G "MinGW Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug .. 174 * $ cmake -G "MinGW Makefiles" -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D WITH_FFMPEG=OFF -D CMAKE_BUILD_TYPE=Debug ..
@@ -208,7 +207,7 @@ $ br -help @@ -208,7 +207,7 @@ $ br -help
208 * $ cd C:\openbr 207 * $ cd C:\openbr
209 * $ mkdir build-mingw64 208 * $ mkdir build-mingw64
210 * $ cd build-mingw64 209 * $ cd build-mingw64
211 - * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.3/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release .. 210 + * $ cmake -G "CodeBlocks - MinGW Makefiles" -D CMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -D CMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-mingw64/install;C:/Qt/5.0.1/mingw64" -D CMAKE_INSTALL_PREFIX="./install" -D BR_INSTALL_DEPENDENCIES=ON -D CMAKE_BUILD_TYPE=Release ..
212 * $ mingw32-make 211 * $ mingw32-make
213 * $ mingw32-make install 212 * $ mingw32-make install
214 * \endcode 213 * \endcode
@@ -250,18 +249,18 @@ $ br -help @@ -250,18 +249,18 @@ $ br -help
250 * $ cd .. 249 * $ cd ..
251 * $ rm -r cmake-2.8.10.2 250 * $ rm -r cmake-2.8.10.2
252 * \endcode 251 * \endcode
253 - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. 252 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
254 * \code 253 * \code
255 * $ cd ~/Downloads 254 * $ cd ~/Downloads
256 - * $ tar -xf OpenCV-2.4.3.tar.bz2  
257 - * $ cd OpenCV-2.4.3 255 + * $ tar -xf OpenCV-2.4.4.tar.bz2
  256 + * $ cd OpenCV-2.4.4
258 * $ mkdir build 257 * $ mkdir build
259 * $ cd build 258 * $ cd build
260 - * $ cmake .. 259 + * $ cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release ..
261 * $ make -j4 260 * $ make -j4
262 * $ sudo make install 261 * $ sudo make install
263 * $ cd ../.. 262 * $ cd ../..
264 - * $ rm -r OpenCV-2.4.3 263 + * $ rm -r OpenCV-2.4.4
265 * \endcode 264 * \endcode
266 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-mac-opensource-5.0.1-clang-offline.dmg">Download Qt 5.0.1</a> and install. 265 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-mac-opensource-5.0.1-clang-offline.dmg">Download Qt 5.0.1</a> and install.
267 * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>. 266 * -# Create a <a href="github.com">GitHub</a> account, follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
@@ -296,7 +295,7 @@ $ br -help @@ -296,7 +295,7 @@ $ br -help
296 * $ make package 295 * $ make package
297 * \endcode 296 * \endcode
298 * -# Build OpenBR documentation! 297 * -# Build OpenBR documentation!
299 - * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.3.1.src.tar.gz">Download Doxygen 1.8.3.1</a> and install: 298 + * -# <a href="ftp://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz">Download Doxygen 1.8.2</a> and install:
300 * \code 299 * \code
301 * $ cd ~/Downloads 300 * $ cd ~/Downloads
302 * $ tar -xf doxygen-1.8.2.src.tar.gz 301 * $ tar -xf doxygen-1.8.2.src.tar.gz
@@ -334,18 +333,18 @@ $ br -help @@ -334,18 +333,18 @@ $ br -help
334 * $ cd .. 333 * $ cd ..
335 * $ rm -r cmake-2.8.10.2 334 * $ rm -r cmake-2.8.10.2
336 * \endcode 335 * \endcode
337 - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. 336 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
338 * \code 337 * \code
339 * $ cd ~/Downloads 338 * $ cd ~/Downloads
340 - * $ tar -xf OpenCV-2.4.3.tar.bz2  
341 - * $ cd OpenCV-2.4.3 339 + * $ tar -xf OpenCV-2.4.4.tar.bz2
  340 + * $ cd OpenCV-2.4.4
342 * $ mkdir build 341 * $ mkdir build
343 * $ cd build 342 * $ cd build
344 - * $ cmake -D CMAKE_BUILD_TYPE=Release .. 343 + * $ cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release ..
345 * $ make -j4 344 * $ make -j4
346 * $ sudo make install 345 * $ sudo make install
347 * $ cd ../.. 346 * $ cd ../..
348 - * $ rm -r OpenCV-2.4.3 347 + * $ rm -r OpenCV-2.4.4
349 * \endcode 348 * \endcode
350 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>. 349 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>.
351 * \code 350 * \code
@@ -401,18 +400,18 @@ $ br -help @@ -401,18 +400,18 @@ $ br -help
401 * $ cd .. 400 * $ cd ..
402 * $ rm -r cmake-2.8.10.2 401 * $ rm -r cmake-2.8.10.2
403 * \endcode 402 * \endcode
404 - * -# <a href="http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.3/OpenCV-2.4.3.tar.bz2/download">Download OpenCV 2.4.3</a>. 403 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>.
405 * \code 404 * \code
406 * $ cd ~/Downloads 405 * $ cd ~/Downloads
407 - * $ tar -xf OpenCV-2.4.3.tar.bz2  
408 - * $ cd OpenCV-2.4.3 406 + * $ tar -xf OpenCV-2.4.4.tar.bz2
  407 + * $ cd OpenCV-2.4.4
409 * $ mkdir build 408 * $ mkdir build
410 * $ cd build 409 * $ cd build
411 - * $ cmake -D CMAKE_BUILD_TYPE=Release .. 410 + * $ cmake cmake -D BUILD_opencv_java=OFF -D BUILD_opencv_world=ON -D CMAKE_BUILD_TYPE=Release ..
412 * $ make -j4 411 * $ make -j4
413 * $ sudo make install 412 * $ sudo make install
414 * $ cd ../.. 413 * $ cd ../..
415 - * $ rm -r OpenCV-2.4.3 414 + * $ rm -r OpenCV-2.4.4
416 * \endcode 415 * \endcode
417 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>. 416 * -# <a href="http://releases.qt-project.org/qt5/5.0.1/qt-linux-opensource-5.0.1-x86_64-offline.run">Download Qt 5.0.1</a>.
418 * \code 417 * \code
sdk/plugins/misc.cpp
  View file @44cdf3b
@@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform @@ -40,7 +40,7 @@ class OpenTransform : public UntrainableMetaTransform
40 foreach (const File &file, src.file.split()) { 40 foreach (const File &file, src.file.split()) {
41 QScopedPointer<Format> format(Factory<Format>::make(file)); 41 QScopedPointer<Format> format(Factory<Format>::make(file));
42 Template t = format->read(); 42 Template t = format->read();
43 - if (t.isEmpty()) qWarning("Can't open %s", qPrintable(file.flat())); 43 + if (t.isEmpty()) qWarning("Can't open %s from %s", qPrintable(file.flat()), qPrintable(QDir::currentPath()));
44 dst.append(t); 44 dst.append(t);
45 dst.file.append(t.file.localMetadata()); 45 dst.file.append(t.file.localMetadata());
46 } 46 }