Merge pull request #1348 from SpecLad:merge-2.4

pull/1356/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
commit e59c74e1c7
  1. 60
      .gitattributes
  2. 1
      3rdparty/.gitattributes
  3. 2
      3rdparty/ffmpeg/readme.txt
  4. 0
      3rdparty/libpng/opencv-libpng.patch
  5. 1
      3rdparty/libtiff/tif_config.h.cmakein
  6. 3
      CMakeLists.txt
  7. 1
      apps/CMakeLists.txt
  8. 1
      apps/haartraining/CMakeLists.txt
  9. 1
      apps/haartraining/_cvcommon.h
  10. 1
      apps/haartraining/performance.cpp
  11. 1
      apps/traincascade/CMakeLists.txt
  12. 5
      cmake/OpenCVCRTLinkage.cmake
  13. 4
      cmake/OpenCVCompilerOptions.cmake
  14. 13
      cmake/OpenCVFindIPP.cmake
  15. 9
      cmake/OpenCVFindLibsGUI.cmake
  16. 2
      cmake/OpenCVFindLibsGrfmt.cmake
  17. 9
      cmake/OpenCVFindLibsVideo.cmake
  18. 4
      cmake/OpenCVGenInfoPlist.cmake
  19. 2
      cmake/OpenCVUtils.cmake
  20. 2
      cmake/templates/cmake_uninstall.cmake.in
  21. 1
      doc/_static/insertIframe.js
  22. 2
      doc/check_docs.py
  23. 1
      doc/mymath.sty
  24. 1
      doc/pattern_tools/svgfig.py
  25. 1
      doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.rst
  26. 3
      doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst
  27. 3
      doc/tutorials/features2d/feature_description/feature_description.rst
  28. 1
      doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.rst
  29. 1
      doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
  30. 1
      doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst
  31. 2
      doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
  32. 2
      doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
  33. 1
      doc/tutorials/general/table_of_content_general/table_of_content_general.rst
  34. 5
      doc/tutorials/highgui/trackbar/trackbar.rst
  35. 1
      doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
  36. 1
      doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
  37. 3
      doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
  38. 1
      doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
  39. 1
      doc/tutorials/imgproc/imgtrans/remap/remap.rst
  40. 1
      doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
  41. 1
      doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
  42. 2
      doc/tutorials/imgproc/pyramids/pyramids.rst
  43. 1
      doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
  44. 1
      doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
  45. 1
      doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
  46. 1
      doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
  47. 1
      doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
  48. 1
      doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
  49. 3
      doc/tutorials/imgproc/table_of_content_imgproc/table_of_content_imgproc.rst
  50. 3
      doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
  51. 1
      doc/tutorials/introduction/linux_install/linux_install.rst
  52. 1
      doc/tutorials/ios/hello/hello.rst
  53. 1
      doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
  54. 1
      doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
  55. 2
      include/CMakeLists.txt
  56. 1
      include/opencv/cv.h
  57. 1
      include/opencv/cxeigen.hpp
  58. 1
      modules/androidcamera/camera_wrapper/camera_wrapper.h
  59. 1
      modules/calib3d/doc/calib3d.rst
  60. 1
      modules/calib3d/src/compat_ptsetreg.cpp
  61. 1
      modules/calib3d/src/epnp.cpp
  62. 1
      modules/calib3d/src/p3p.cpp
  63. 1
      modules/calib3d/src/p3p.h
  64. 1
      modules/calib3d/src/ptsetreg.cpp
  65. 1
      modules/calib3d/src/solvepnp.cpp
  66. 1
      modules/calib3d/src/stereosgbm.cpp
  67. 1
      modules/calib3d/test/test_affine3d_estimator.cpp
  68. 2
      modules/calib3d/test/test_cameracalibration_badarg.cpp
  69. 1
      modules/calib3d/test/test_chessboardgenerator.cpp
  70. 1
      modules/calib3d/test/test_compose_rt.cpp
  71. 1
      modules/calib3d/test/test_modelest.cpp
  72. 1
      modules/calib3d/test/test_precomp.hpp
  73. 1
      modules/calib3d/test/test_reproject_image_to_3d.cpp
  74. 2
      modules/contrib/doc/facerec/facerec_tutorial.rst
  75. 1
      modules/contrib/doc/facerec/index.rst
  76. 1
      modules/contrib/doc/facerec/src/CMakeLists.txt
  77. 2
      modules/contrib/doc/facerec/tutorial/facerec_gender_classification.rst
  78. 1
      modules/contrib/doc/facerec/tutorial/facerec_save_load.rst
  79. 2
      modules/contrib/doc/facerec/tutorial/facerec_video_recognition.rst
  80. 2
      modules/contrib/doc/stereo.rst
  81. 2
      modules/contrib/src/adaptiveskindetector.cpp
  82. 1
      modules/contrib/src/bowmsctrainer.cpp
  83. 1
      modules/contrib/src/chowliutree.cpp
  84. 2
      modules/contrib/src/colortracker.cpp
  85. 1
      modules/contrib/src/contrib_init.cpp
  86. 1
      modules/contrib/src/detection_based_tracker.cpp
  87. 1
      modules/contrib/src/featuretracker.cpp
  88. 1
      modules/contrib/src/fuzzymeanshifttracker.cpp
  89. 1
      modules/contrib/src/hybridtracker.cpp
  90. 35
      modules/contrib/src/inputoutput.cpp
  91. 1
      modules/contrib/src/lda.cpp
  92. 1
      modules/contrib/src/logpolar_bsm.cpp
  93. 1
      modules/contrib/test/test_precomp.hpp
  94. 3
      modules/core/doc/basic_structures.rst
  95. 1
      modules/core/doc/command_line_parser.rst
  96. 1
      modules/core/doc/core.rst
  97. 1
      modules/core/doc/dynamic_structures.rst
  98. 1
      modules/core/doc/old_basic_structures.rst
  99. 2
      modules/core/include/opencv2/core/affine.hpp
  100. 1
      modules/core/perf/perf_abs.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

60
.gitattributes vendored

@ -1,42 +1,58 @@
.git* export-ignore
* text=auto whitespace=trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,tabwidth=4 * text=auto whitespace=trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,tabwidth=4
*.py text .git* text export-ignore
*.aidl text
*.appxmanifest text
*.bib text
*.c text
*.cl text
*.conf text
*.cpp text *.cpp text
*.hpp text *.css_t text
*.cu text
*.cxx text *.cxx text
*.hxx text *.def text
*.mm text *.filelist text
*.c text
*.h text *.h text
*.hpp text
*.htm text
*.html text
*.hxx text
*.i text *.i text
*.js text *.idl text
*.java text *.java text
*.scala text *.js text
*.cu text *.mk text
*.cl text *.mm text
*.css_t text *.plist text
*.properties text
*.py text
*.qrc text *.qrc text
*.qss text *.qss text
*.S text *.S text
*.rst text *.sbt text
*.tex text *.scala text
*.sty text *.sty text
*.tex text
*.txt text
*.xaml text
*.aidl text # reST underlines/overlines can look like conflict markers
*.mk text *.rst text conflict-marker-size=80
*.cmake text whitespace=tabwidth=2 *.cmake text whitespace=tabwidth=2
*.cmakein text whitespace=tabwidth=2 *.cmakein text whitespace=tabwidth=2
*.in text whitespace=tabwidth=2 *.in text whitespace=tabwidth=2
CMakeLists.txt text whitespace=tabwidth=2 CMakeLists.txt text whitespace=tabwidth=2
*.png binary *.avi binary
*.jpeg binary *.bmp binary
*.jpg binary
*.exr binary *.exr binary
*.ico binary *.ico binary
*.jpeg binary
*.jpg binary
*.png binary
*.a binary *.a binary
*.so binary *.so binary
@ -47,6 +63,7 @@ CMakeLists.txt text whitespace=tabwidth=2
*.pbxproj binary *.pbxproj binary
*.vec binary *.vec binary
*.doc binary *.doc binary
*.dia binary
*.xml -text whitespace=cr-at-eol *.xml -text whitespace=cr-at-eol
*.yml -text whitespace=cr-at-eol *.yml -text whitespace=cr-at-eol
@ -55,9 +72,12 @@ CMakeLists.txt text whitespace=tabwidth=2
.cproject -text whitespace=cr-at-eol merge=union .cproject -text whitespace=cr-at-eol merge=union
org.eclipse.jdt.core.prefs -text whitespace=cr-at-eol merge=union org.eclipse.jdt.core.prefs -text whitespace=cr-at-eol merge=union
*.vcproj text eol=crlf merge=union
*.bat text eol=crlf *.bat text eol=crlf
*.cmd text eol=crlf *.cmd text eol=crlf
*.cmd.tmpl text eol=crlf *.cmd.tmpl text eol=crlf
*.dsp text eol=crlf -whitespace
*.sln text eol=crlf -whitespace
*.vcproj text eol=crlf -whitespace merge=union
*.vcxproj text eol=crlf -whitespace merge=union
*.sh text eol=lf *.sh text eol=lf

@ -0,0 +1 @@
* -whitespace

@ -40,5 +40,3 @@ How to update opencv_ffmpeg.dll and opencv_ffmpeg_64.dll when a new version of F
8. Then, go to <opencv>\3rdparty\ffmpeg, edit make.bat 8. Then, go to <opencv>\3rdparty\ffmpeg, edit make.bat
(change paths to the actual paths to your msys32 and msys64 distributions) and then run make.bat (change paths to the actual paths to your msys32 and msys64 distributions) and then run make.bat

@ -168,4 +168,3 @@
/* Support Deflate compression */ /* Support Deflate compression */
#define ZIP_SUPPORT 1 #define ZIP_SUPPORT 1

@ -460,6 +460,8 @@ include(cmake/OpenCVGenAndroidMK.cmake)
# Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects # Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects
include(cmake/OpenCVGenConfig.cmake) include(cmake/OpenCVGenConfig.cmake)
# Generate Info.plist for the IOS framework
include(cmake/OpenCVGenInfoPlist.cmake)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Summary: # Summary:
@ -863,4 +865,3 @@ ocv_finalize_status()
if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
message(WARNING "The source directory is the same as binary directory. \"make clean\" may damage the source tree") message(WARNING "The source directory is the same as binary directory. \"make clean\" may damage the source tree")
endif() endif()

@ -3,4 +3,3 @@ add_definitions(-D__OPENCV_BUILD=1)
add_subdirectory(haartraining) add_subdirectory(haartraining)
add_subdirectory(traincascade) add_subdirectory(traincascade)
add_subdirectory(sft) add_subdirectory(sft)

@ -79,4 +79,3 @@ if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications") set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")
set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications") set_target_properties(opencv_haartraining_engine PROPERTIES FOLDER "applications")
endif() endif()

@ -90,4 +90,3 @@ int icvGetIdxAt( CvMat* idx, int pos )
void icvSave( const CvArr* ptr, const char* filename, int line ); void icvSave( const CvArr* ptr, const char* filename, int line );
#endif /* __CVCOMMON_H_ */ #endif /* __CVCOMMON_H_ */

@ -375,4 +375,3 @@ int main( int argc, char* argv[] )
return 0; return 0;
} }

@ -34,4 +34,3 @@ if(ENABLE_SOLUTION_FOLDERS)
endif() endif()
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)

@ -26,8 +26,8 @@ else()
set(HAVE_MSVC2012 TRUE) set(HAVE_MSVC2012 TRUE)
endif() endif()
TRY_COMPILE(HAVE_WINRT_SDK try_compile(HAVE_WINRT_SDK
"${OPENCV_BINARY_DIR}/CMakeFiles/CMakeTmp" "${OpenCV_BINARY_DIR}"
"${OpenCV_SOURCE_DIR}/cmake/checks/winrttest.cpp") "${OpenCV_SOURCE_DIR}/cmake/checks/winrttest.cpp")
if (ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK) if (ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK)
@ -98,4 +98,3 @@ if(NOT BUILD_WITH_DEBUG_INFO AND NOT MSVC)
string(REPLACE "/Zi" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") string(REPLACE "/Zi" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
endif() endif()

@ -233,6 +233,10 @@ if(MSVC)
set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /fp:fast") # !! important - be on the same wave with x64 compilers set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /fp:fast") # !! important - be on the same wave with x64 compilers
endif() endif()
endif() endif()
if(OPENCV_WARNINGS_ARE_ERRORS)
set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /WX")
endif()
endif() endif()
# Extra link libs if the user selects building static libs: # Extra link libs if the user selects building static libs:

@ -136,17 +136,20 @@ endfunction()
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
# This is auxiliary function called from set_ipp_variables() # This is auxiliary function called from set_ipp_variables()
# to set IPP_LIBRARIES variable in IPP 7.x style # to set IPP_LIBRARIES variable in IPP 7.x and 8.x style
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
function(set_ipp_new_libraries _LATEST_VERSION) function(set_ipp_new_libraries _LATEST_VERSION)
set(IPP_PREFIX "ipp") set(IPP_PREFIX "ipp")
if(${_LATEST_VERSION} VERSION_LESS "8.0") if(${_LATEST_VERSION} VERSION_LESS "8.0")
set(IPP_SUFFIX "_l") # static not threaded libs suffix set(IPP_SUFFIX "_l") # static not threaded libs suffix IPP 7.x
else() else()
set(IPP_SUFFIX "") # static not threaded libs suffix if(WIN32)
set(IPP_SUFFIX "mt") # static not threaded libs suffix IPP 8.x for Windows
else()
set(IPP_SUFFIX "") # static not threaded libs suffix IPP 8.x for Linux/OS X
endif()
endif() endif()
set(IPP_THRD "_t") # static threaded libs suffix
set(IPPCORE "core") # core functionality set(IPPCORE "core") # core functionality
set(IPPSP "s") # signal processing set(IPPSP "s") # signal processing
set(IPPIP "i") # image processing set(IPPIP "i") # image processing
@ -218,7 +221,7 @@ function(set_ipp_variables _LATEST_VERSION)
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE) set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
endif() endif()
# set IPP_LIBRARIES variable (7.x lib names) # set IPP_LIBRARIES variable (7.x or 8.x lib names)
set_ipp_new_libraries(${_LATEST_VERSION}) set_ipp_new_libraries(${_LATEST_VERSION})
set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE) set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
message(STATUS "IPP libs: ${IPP_LIBRARIES}") message(STATUS "IPP libs: ${IPP_LIBRARIES}")

@ -5,12 +5,11 @@
#--- Win32 UI --- #--- Win32 UI ---
ocv_clear_vars(HAVE_WIN32UI) ocv_clear_vars(HAVE_WIN32UI)
if(WITH_WIN32UI) if(WITH_WIN32UI)
TRY_COMPILE(HAVE_WIN32UI try_compile(HAVE_WIN32UI
"${OPENCV_BINARY_DIR}/CMakeFiles/CMakeTmp" "${OpenCV_BINARY_DIR}"
"${OpenCV_SOURCE_DIR}/cmake/checks/win32uitest.cpp" "${OpenCV_SOURCE_DIR}/cmake/checks/win32uitest.cpp"
CMAKE_FLAGS "\"user32.lib\" \"gdi32.lib\"" CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=user32;gdi32")
OUTPUT_VARIABLE OUTPUT) endif()
endif(WITH_WIN32UI)
# --- QT4 --- # --- QT4 ---
ocv_clear_vars(HAVE_QT HAVE_QT5) ocv_clear_vars(HAVE_QT HAVE_QT5)

@ -149,7 +149,7 @@ if(WITH_JASPER)
endif() endif()
# --- libpng (optional, should be searched after zlib) --- # --- libpng (optional, should be searched after zlib) ---
if(WITH_PNG AND NOT IOS) if(WITH_PNG)
if(BUILD_PNG) if(BUILD_PNG)
ocv_clear_vars(PNG_FOUND) ocv_clear_vars(PNG_FOUND)
else() else()

@ -4,11 +4,10 @@
ocv_clear_vars(HAVE_VFW) ocv_clear_vars(HAVE_VFW)
if(WITH_VFW) if(WITH_VFW)
TRY_COMPILE(HAVE_VFW try_compile(HAVE_VFW
"${OPENCV_BINARY_DIR}/CMakeFiles/CMakeTmp" "${OpenCV_BINARY_DIR}"
"${OpenCV_SOURCE_DIR}/cmake/checks/vfwtest.cpp" "${OpenCV_SOURCE_DIR}/cmake/checks/vfwtest.cpp"
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=vfw32" CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=vfw32")
OUTPUT_VARIABLE OUTPUT)
endif(WITH_VFW) endif(WITH_VFW)
# --- GStreamer --- # --- GStreamer ---
@ -271,8 +270,10 @@ if(WITH_AVFOUNDATION)
endif() endif()
# --- QuickTime --- # --- QuickTime ---
if (NOT IOS)
if(WITH_QUICKTIME) if(WITH_QUICKTIME)
set(HAVE_QUICKTIME YES) set(HAVE_QUICKTIME YES)
elseif(APPLE) elseif(APPLE)
set(HAVE_QTKIT YES) set(HAVE_QTKIT YES)
endif() endif()
endif()

@ -0,0 +1,4 @@
if(IOS)
configure_file("${OpenCV_SOURCE_DIR}/platforms/ios/Info.plist.in"
"${CMAKE_BINARY_DIR}/ios/Info.plist")
endif()

@ -77,7 +77,7 @@ MACRO(ocv_check_compiler_flag LANG FLAG RESULT)
if(_fname) if(_fname)
MESSAGE(STATUS "Performing Test ${RESULT}") MESSAGE(STATUS "Performing Test ${RESULT}")
TRY_COMPILE(${RESULT} TRY_COMPILE(${RESULT}
${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}"
"${_fname}" "${_fname}"
COMPILE_DEFINITIONS "${FLAG}" COMPILE_DEFINITIONS "${FLAG}"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)

@ -23,5 +23,3 @@ FOREACH(file ${files})
MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
ENDIF(EXISTS "$ENV{DESTDIR}${file}") ENDIF(EXISTS "$ENV{DESTDIR}${file}")
ENDFOREACH(file) ENDFOREACH(file)

@ -10,4 +10,3 @@ function insertIframe (elementId, iframeSrc)
element.parentNode.replaceChild(iframe, element); element.parentNode.replaceChild(iframe, element);
} }
} }

@ -184,5 +184,3 @@ p = RSTParser()
for m in opencv_module_list: for m in opencv_module_list:
print "\n\n*************************** " + m + " *************************\n" print "\n\n*************************** " + m + " *************************\n"
p.check_module_docs(m) p.check_module_docs(m)

@ -39,4 +39,3 @@
#7 & #8 & #9 #7 & #8 & #9
\end{bmatrix} \end{bmatrix}
} }

@ -3667,4 +3667,3 @@ class YErrorBars:
output.append(LineAxis(x, start, x, end, start, end, bars, False, False, **self.attr).SVG(trans)) output.append(LineAxis(x, start, x, end, start, end, bars, False, False, **self.attr).SVG(trans))
return output return output

@ -277,4 +277,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
<div align="center"> <div align="center">
<iframe title="File Input and Output using XML and YAML files in OpenCV" width="560" height="349" src="http://www.youtube.com/embed/A4yqVnByMMM?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe> <iframe title="File Input and Output using XML and YAML files in OpenCV" width="560" height="349" src="http://www.youtube.com/embed/A4yqVnByMMM?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div> </div>

@ -127,6 +127,3 @@ You may observe a runtime instance of this on the `YouTube here <https://www.you
<div align="center"> <div align="center">
<iframe title="Interoperability with OpenCV 1" width="560" height="349" src="http://www.youtube.com/embed/qckm-zvo31w?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe> <iframe title="Interoperability with OpenCV 1" width="560" height="349" src="http://www.youtube.com/embed/qckm-zvo31w?rel=0&loop=1" frameborder="0" allowfullscreen align="middle"></iframe>
</div> </div>

@ -100,6 +100,3 @@ Result
.. image:: images/Feature_Description_BruteForce_Result.jpg .. image:: images/Feature_Description_BruteForce_Result.jpg
:align: center :align: center
:height: 200pt :height: 200pt

@ -201,4 +201,3 @@ Learn about how to use the feature points detectors, descriptors and matching f
../feature_flann_matcher/feature_flann_matcher ../feature_flann_matcher/feature_flann_matcher
../feature_homography/feature_homography ../feature_homography/feature_homography
../detection_of_planar_objects/detection_of_planar_objects ../detection_of_planar_objects/detection_of_planar_objects

@ -135,4 +135,3 @@ Here is the result:
.. image:: images/Corner_Subpixeles_Result.jpg .. image:: images/Corner_Subpixeles_Result.jpg
:align: center :align: center

@ -37,4 +37,3 @@ Result
.. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg .. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg
:align: center :align: center

@ -118,5 +118,3 @@ Result
.. image:: images/Feature_Detection_Result_a.jpg .. image:: images/Feature_Detection_Result_a.jpg
:align: center :align: center

@ -243,5 +243,3 @@ The detected corners are surrounded by a small black circle
.. image:: images/Harris_Detector_Result.jpg .. image:: images/Harris_Detector_Result.jpg
:align: center :align: center

@ -10,4 +10,3 @@ These tutorials are the bottom of the iceberg as they link together multiple of
.. raw:: latex .. raw:: latex
\pagebreak \pagebreak

@ -152,8 +152,3 @@ Result
.. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg .. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
:alt: Adding Trackbars - Lena :alt: Adding Trackbars - Lena
:align: center :align: center

@ -329,4 +329,3 @@ Result
.. image:: images/Histogram_Calculation_Result.jpg .. image:: images/Histogram_Calculation_Result.jpg
:align: center :align: center

@ -369,4 +369,3 @@ Results
.. image:: images/Template_Matching_Image_Result.jpg .. image:: images/Template_Matching_Image_Result.jpg
:align: center :align: center

@ -282,6 +282,3 @@ Result
:align: center :align: center
* Notice how the image is superposed to the black background on the edge regions. * Notice how the image is superposed to the black background on the edge regions.

@ -290,4 +290,3 @@ We get the following result by using the Probabilistic Hough Line Transform:
:align: center :align: center
You may observe that the number of lines detected vary while you change the *threshold*. The explanation is sort of evident: If you establish a higher threshold, fewer lines will be detected (since you will need more points to declare a line detected). You may observe that the number of lines detected vary while you change the *threshold*. The explanation is sort of evident: If you establish a higher threshold, fewer lines will be detected (since you will need more points to declare a line detected).

@ -311,4 +311,3 @@ Result
:alt: Result 0 for remapping :alt: Result 0 for remapping
:width: 250pt :width: 250pt
:align: center :align: center

@ -306,4 +306,3 @@ Result
:alt: Original image :alt: Original image
:width: 250pt :width: 250pt
:align: center :align: center

@ -279,4 +279,3 @@ Results
.. image:: images/Morphology_2_Tutorial_Cover.jpg .. image:: images/Morphology_2_Tutorial_Cover.jpg
:alt: Morphology 2: Result sample :alt: Morphology 2: Result sample
:align: center :align: center

@ -259,5 +259,3 @@ Results
.. image:: images/Pyramids_Tutorial_PyrUp_Result.jpg .. image:: images/Pyramids_Tutorial_PyrUp_Result.jpg
:alt: Pyramids: PyrUp Result :alt: Pyramids: PyrUp Result
:align: center :align: center

@ -121,4 +121,3 @@ Result
.. |BRC_1| image:: images/Bounding_Rects_Circles_Result.jpg .. |BRC_1| image:: images/Bounding_Rects_Circles_Result.jpg
:align: middle :align: middle

@ -123,4 +123,3 @@ Result
.. |BRE_1| image:: images/Bounding_Rotated_Ellipses_Result.jpg .. |BRE_1| image:: images/Bounding_Rotated_Ellipses_Result.jpg
:align: middle :align: middle

@ -104,4 +104,3 @@ Result
.. |contour_1| image:: images/Find_Contours_Result.jpg .. |contour_1| image:: images/Find_Contours_Result.jpg
:align: middle :align: middle

@ -113,4 +113,3 @@ Result
.. |Hull_1| image:: images/Hull_Result.jpg .. |Hull_1| image:: images/Hull_Result.jpg
:align: middle :align: middle

@ -133,4 +133,3 @@ Result
.. |MU_2| image:: images/Moments_Result2.jpg .. |MU_2| image:: images/Moments_Result2.jpg
:width: 250pt :width: 250pt
:align: middle :align: middle

@ -114,4 +114,3 @@ Result
.. |PPT_1| image:: images/Point_Polygon_Test_Result.jpg .. |PPT_1| image:: images/Point_Polygon_Test_Result.jpg
:align: middle :align: middle

@ -539,6 +539,3 @@ In this section you will learn about the image processing (manipulation) functio
../shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses ../shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses
../shapedescriptors/moments/moments ../shapedescriptors/moments/moments
../shapedescriptors/point_polygon_test/point_polygon_test ../shapedescriptors/point_polygon_test/point_polygon_test

@ -245,6 +245,3 @@ Say you have or create a new file, *helloworld.cpp* in a directory called *foo*:
a. You can also optionally modify the ``Build command:`` from ``make`` to something like ``make VERBOSE=1 -j4`` which tells the compiler to produce detailed symbol files for debugging and also to compile in 4 parallel threads. a. You can also optionally modify the ``Build command:`` from ``make`` to something like ``make VERBOSE=1 -j4`` which tells the compiler to produce detailed symbol files for debugging and also to compile in 4 parallel threads.
#. Done! #. Done!

@ -80,4 +80,3 @@ Building OpenCV from Source Using CMake, Using the Command Line
.. note:: .. note::
If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter. If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter.

@ -73,4 +73,3 @@ Now we will learn how to write a simple Hello World Application in Xcode using O
.. image:: images/output.png .. image:: images/output.png
:alt: output :alt: output
:align: center :align: center

@ -185,4 +185,3 @@ Results
.. image:: images/result.png .. image:: images/result.png
:alt: The seperated planes :alt: The seperated planes
:align: center :align: center

@ -130,4 +130,3 @@ Result
.. image:: images/Cascade_Classifier_Tutorial_Result_LBP.jpg .. image:: images/Cascade_Classifier_Tutorial_Result_LBP.jpg
:align: center :align: center
:height: 300pt :height: 300pt

@ -5,5 +5,3 @@ install(FILES ${old_hdrs}
install(FILES "opencv2/opencv.hpp" install(FILES "opencv2/opencv.hpp"
DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
COMPONENT main) COMPONENT main)

@ -73,4 +73,3 @@
#endif //CV_IMPL #endif //CV_IMPL
#endif // __OPENCV_OLD_CV_H_ #endif // __OPENCV_OLD_CV_H_

@ -46,4 +46,3 @@
#include "opencv2/core/eigen.hpp" #include "opencv2/core/eigen.hpp"
#endif #endif

@ -14,4 +14,3 @@ double getCameraPropertyC(void* camera, int propIdx);
void setCameraPropertyC(void* camera, int propIdx, double value); void setCameraPropertyC(void* camera, int propIdx, double value);
void applyCameraPropertiesC(void** camera); void applyCameraPropertiesC(void** camera);
} }

@ -6,4 +6,3 @@ calib3d. Camera Calibration and 3D Reconstruction
:maxdepth: 2 :maxdepth: 2
camera_calibration_and_3d_reconstruction camera_calibration_and_3d_reconstruction

@ -428,4 +428,3 @@ CV_IMPL void cvConvertPointsHomogeneous( const CvMat* _src, CvMat* _dst )
dst.convertTo(dst0, dst0.type()); dst.convertTo(dst0, dst0.type());
} }
} }

@ -621,4 +621,3 @@ void epnp::qr_solve(CvMat * A, CvMat * b, CvMat * X)
pX[i] = (pb[i] - sum) / A2[i]; pX[i] = (pb[i] - sum) / A2[i];
} }
} }

@ -411,4 +411,3 @@ bool p3p::jacobi_4x4(double * A, double * D, double * U)
return false; return false;
} }

@ -59,4 +59,3 @@ class p3p
}; };
#endif // P3P_H #endif // P3P_H

@ -534,4 +534,3 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
return createRANSACPointSetRegistrator(new Affine3DEstimatorCallback, 4, param1, param2)->run(dFrom, dTo, _out, _inliers); return createRANSACPointSetRegistrator(new Affine3DEstimatorCallback, 4, param1, param2)->run(dFrom, dTo, _out, _inliers);
} }

@ -348,4 +348,3 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
} }
return; return;
} }

@ -1169,4 +1169,3 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
} }
} }
} }

@ -195,4 +195,3 @@ void CV_Affine3D_EstTest::run( int /* start_from */)
} }
TEST(Calib3d_EstimateAffineTransform, accuracy) { CV_Affine3D_EstTest test; test.safe_run(); } TEST(Calib3d_EstimateAffineTransform, accuracy) { CV_Affine3D_EstTest test; test.safe_run(); }

@ -735,5 +735,3 @@ protected:
TEST(Calib3d_CalibrateCamera_C, badarg) { CV_CameraCalibrationBadArgTest test; test.safe_run(); } TEST(Calib3d_CalibrateCamera_C, badarg) { CV_CameraCalibrationBadArgTest test; test.safe_run(); }
TEST(Calib3d_Rodrigues_C, badarg) { CV_Rodrigues2BadArgTest test; test.safe_run(); } TEST(Calib3d_Rodrigues_C, badarg) { CV_Rodrigues2BadArgTest test; test.safe_run(); }
TEST(Calib3d_ProjectPoints_C, badarg) { CV_ProjectPoints2BadArgTest test; test.safe_run(); } TEST(Calib3d_ProjectPoints_C, badarg) { CV_ProjectPoints2BadArgTest test; test.safe_run(); }

@ -329,4 +329,3 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const
return generateChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2, return generateChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2,
squareSize.width, squareSize.height, pts3d, corners); squareSize.width, squareSize.height, pts3d, corners);
} }

@ -212,4 +212,3 @@ protected:
}; };
TEST(Calib3d_ComposeRT, accuracy) { CV_composeRT_Test test; test.safe_run(); } TEST(Calib3d_ComposeRT, accuracy) { CV_composeRT_Test test; test.safe_run(); }

@ -229,4 +229,3 @@ void CV_ModelEstimator2_Test::run_func()
TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); } TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); }
#endif #endif

@ -21,4 +21,3 @@ namespace cvtest
} }
#endif #endif

@ -173,4 +173,3 @@ protected:
}; };
TEST(Calib3d_ReprojectImageTo3D, accuracy) { CV_ReprojectImageTo3DTest test; test.safe_run(); } TEST(Calib3d_ReprojectImageTo3D, accuracy) { CV_ReprojectImageTo3DTest test; test.safe_run(); }

@ -626,5 +626,3 @@ CSV for the AT&T Facedatabase
.. literalinclude:: etc/at.txt .. literalinclude:: etc/at.txt
:language: none :language: none
:linenos: :linenos:

@ -30,4 +30,3 @@ Indices and tables
* :ref:`genindex` * :ref:`genindex`
* :ref:`modindex` * :ref:`modindex`
* :ref:`search` * :ref:`search`

@ -23,4 +23,3 @@ target_link_libraries(facerec_fisherfaces opencv_contrib opencv_core opencv_imgp
add_executable(facerec_lbph facerec_lbph.cpp) add_executable(facerec_lbph facerec_lbph.cpp)
target_link_libraries(facerec_lbph opencv_contrib opencv_core opencv_imgproc opencv_highgui) target_link_libraries(facerec_lbph opencv_contrib opencv_core opencv_imgproc opencv_highgui)

@ -231,5 +231,3 @@ Here are some examples:
+---------------------------------+----------------------------------------------------------------------------+ +---------------------------------+----------------------------------------------------------------------------+
| 0.2 (20%), 0.2 (20%), (70,70) | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg | | 0.2 (20%), 0.2 (20%), (70,70) | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg |
+---------------------------------+----------------------------------------------------------------------------+ +---------------------------------+----------------------------------------------------------------------------+

@ -44,4 +44,3 @@ And here is the Reconstruction, which is the same as the original:
.. image:: ../img/eigenface_reconstruction_opencv.png .. image:: ../img/eigenface_reconstruction_opencv.png
:align: center :align: center

@ -205,5 +205,3 @@ Here are some examples:
+---------------------------------+----------------------------------------------------------------------------+ +---------------------------------+----------------------------------------------------------------------------+
| 0.2 (20%), 0.2 (20%), (70,70) | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg | | 0.2 (20%), 0.2 (20%), (70,70) | .. image:: ../img/tutorial/gender_classification/arnie_20_20_70_70.jpg |
+---------------------------------+----------------------------------------------------------------------------+ +---------------------------------+----------------------------------------------------------------------------+

@ -113,5 +113,3 @@ The method executes the variational algorithm on a rectified stereo pair. See ``
**Note**: **Note**:
The method is not constant, so you should not use the same ``StereoVar`` instance from different threads simultaneously. The method is not constant, so you should not use the same ``StereoVar`` instance from different threads simultaneously.

@ -286,5 +286,3 @@ void CvAdaptiveSkinDetector::Histogram::mergeWith(CvAdaptiveSkinDetector::Histog
} }
} }
}; };

@ -136,4 +136,3 @@ Mat BOWMSCTrainer::cluster(const Mat& _descriptors) const {
} }
} }

@ -287,4 +287,3 @@ bool ChowLiuTree::reduceEdgesToMinSpan(std::list<info>& edges) {
} }
} }

@ -132,5 +132,3 @@ Point2f CvMeanShiftTracker::getTrackingCenter()
{ {
return prev_center; return prev_center;
} }

@ -41,4 +41,3 @@
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"

@ -892,4 +892,3 @@ const cv::DetectionBasedTracker::Parameters& DetectionBasedTracker::getParameter
} }
#endif #endif

@ -221,4 +221,3 @@ Point2f CvFeatureTracker::getTrackingCenter()
center.y = (float)(prev_center.y + prev_trackwindow.height/2.0); center.y = (float)(prev_center.y + prev_trackwindow.height/2.0);
return center; return center;
} }

@ -721,4 +721,3 @@ void CvFuzzyMeanShiftTracker::track(IplImage *maskImage, IplImage *depthMap, int
searchMode = tsTracking; searchMode = tsTracking;
} }
}; };

@ -233,4 +233,3 @@ void CvHybridTracker::updateTrackerWithLowPassFilter(Mat) {
Rect CvHybridTracker::getTrackingWindow() { Rect CvHybridTracker::getTrackingWindow() {
return prev_window; return prev_window;
} }

@ -24,10 +24,9 @@ namespace cv
HANDLE hFind; HANDLE hFind;
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
size_t size = mbstowcs(NULL, path_f.c_str(), path_f.size()); wchar_t wpath[MAX_PATH];
Ptr<wchar_t> wpath = new wchar_t[size+1]; size_t copied = mbstowcs(wpath, path_f.c_str(), MAX_PATH);
wpath[size] = 0; CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
mbstowcs(wpath, path_f.c_str(), path_f.size());
hFind = FindFirstFileExW(wpath, FindExInfoStandard, &FindFileData, FindExSearchNameMatch, NULL, 0); hFind = FindFirstFileExW(wpath, FindExInfoStandard, &FindFileData, FindExSearchNameMatch, NULL, 0);
#else #else
hFind = FindFirstFileA((LPCSTR)path_f.c_str(), &FindFileData); hFind = FindFirstFileA((LPCSTR)path_f.c_str(), &FindFileData);
@ -46,12 +45,12 @@ namespace cv
FindFileData.dwFileAttributes == FILE_ATTRIBUTE_SYSTEM || FindFileData.dwFileAttributes == FILE_ATTRIBUTE_SYSTEM ||
FindFileData.dwFileAttributes == FILE_ATTRIBUTE_READONLY) FindFileData.dwFileAttributes == FILE_ATTRIBUTE_READONLY)
{ {
cv::Ptr<char> fname; char* fname;
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
size_t asize = wcstombs(NULL, FindFileData.cFileName, 0); char fname_tmp[MAX_PATH] = {0};
fname = new char[asize+1]; size_t copied = wcstombs(fname_tmp, FindFileData.cFileName, MAX_PATH);
fname[asize] = 0; CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
wcstombs(fname, FindFileData.cFileName, asize); fname = fname_tmp;
#else #else
fname = FindFileData.cFileName; fname = FindFileData.cFileName;
#endif #endif
@ -108,10 +107,10 @@ namespace cv
HANDLE hFind; HANDLE hFind;
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
size_t size = mbstowcs(NULL, path_f.c_str(), path_f.size()); wchar_t wpath [MAX_PATH];
Ptr<wchar_t> wpath = new wchar_t[size+1]; size_t copied = mbstowcs(wpath, path_f.c_str(), path_f.size());
wpath[size] = 0; CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
mbstowcs(wpath, path_f.c_str(), path_f.size());
hFind = FindFirstFileExW(wpath, FindExInfoStandard, &FindFileData, FindExSearchNameMatch, NULL, 0); hFind = FindFirstFileExW(wpath, FindExInfoStandard, &FindFileData, FindExSearchNameMatch, NULL, 0);
#else #else
hFind = FindFirstFileA((LPCSTR)path_f.c_str(), &FindFileData); hFind = FindFirstFileA((LPCSTR)path_f.c_str(), &FindFileData);
@ -134,12 +133,12 @@ namespace cv
strcmp(FindFileData.cFileName, "..") != 0) strcmp(FindFileData.cFileName, "..") != 0)
#endif #endif
{ {
cv::Ptr<char> fname; char* fname;
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
size_t asize = wcstombs(NULL, FindFileData.cFileName, 0); char fname_tmp[MAX_PATH];
fname = new char[asize+1]; size_t copied = wcstombs(fname_tmp, FindFileData.cFileName, MAX_PATH);
fname[asize] = 0; CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
wcstombs(fname, FindFileData.cFileName, asize); fname = fname_tmp;
#else #else
fname = FindFileData.cFileName; fname = FindFileData.cFileName;
#endif #endif

@ -1106,4 +1106,3 @@ Mat LDA::reconstruct(InputArray src) {
} }
} }

@ -649,4 +649,3 @@ LogPolar_Adjacent::~LogPolar_Adjacent()
} }
} }

@ -14,4 +14,3 @@
#include <iostream> #include <iostream>
#endif #endif

@ -1369,7 +1369,7 @@ The method makes a new header for the specified row span of the matrix. Similarl
Mat::colRange Mat::colRange
------------- -------------
Creates a matrix header for the specified row span. Creates a matrix header for the specified column span.
.. ocv:function:: Mat Mat::colRange(int startcol, int endcol) const .. ocv:function:: Mat Mat::colRange(int startcol, int endcol) const
@ -2941,4 +2941,3 @@ The above methods are usually enough for users. If you want to make your own alg
* Add public virtual method ``AlgorithmInfo* info() const;`` to your class. * Add public virtual method ``AlgorithmInfo* info() const;`` to your class.
* Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take http://code.opencv.org/projects/opencv/repository/revisions/master/entry/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters. * Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take http://code.opencv.org/projects/opencv/repository/revisions/master/entry/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters.
* Add some public function (e.g. ``initModule_<mymodule>()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details. * Add some public function (e.g. ``initModule_<mymodule>()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details.

@ -98,4 +98,3 @@ Use:
# ./app -fps=aaa # ./app -fps=aaa
ERRORS: ERRORS:
Exception: can not convert: [aaa] to [double] Exception: can not convert: [aaa] to [double]

@ -16,4 +16,3 @@ core. The Core Functionality
clustering clustering
utility_and_system_functions_and_macros utility_and_system_functions_and_macros
opengl_interop opengl_interop

@ -1580,4 +1580,3 @@ Gathers all node pointers to a single sequence.
:param storage: Container for the sequence :param storage: Container for the sequence
The function puts pointers of all nodes reachable from ``first`` into a single sequence. The pointers are written sequentially in the depth-first order. The function puts pointers of all nodes reachable from ``first`` into a single sequence. The pointers are written sequentially in the depth-first order.

@ -1677,4 +1677,3 @@ For example, `NumPy <http://numpy.scipy.org/>`_ arrays support the array interfa
(480, 640, 3) 1 (480, 640, 3) 1
.. note:: In the new Python wrappers (**cv2** module) the function is not needed, since cv2 can process Numpy arrays (and this is the only supported array type). .. note:: In the new Python wrappers (**cv2** module) the function is not needed, since cv2 can process Numpy arrays (and this is the only supported array type).

@ -430,5 +430,3 @@ cv::Affine3<T>::operator Eigen::Transform<T, 3, Eigen::Affine>() const
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __OPENCV_CORE_AFFINE3_HPP__ */ #endif /* __OPENCV_CORE_AFFINE3_HPP__ */

@ -24,4 +24,3 @@ PERF_TEST_P(Size_MatType, abs, TYPICAL_MATS_ABS)
SANITY_CHECK(c); SANITY_CHECK(c);
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save