mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,741 Commits 6 Branches 126 Tags 3 GiB
a41cbbdc99
Commit Graph

835 Commits

Author SHA1 Message Date
Igor Kuzmin
0421da78b3 XIMEA cam support: allow on OS X too 2014-09-09 19:17:13 +04:00
Alexander Smorkalov
35768ed638 Python tests added to -tests deb package. 2014-09-08 18:11:12 +04:00
Ilya Lavrenov
040ff7993f don't use IPP on ARM 2014-09-01 12:30:49 +04:00
Alexander Alekhin
b70a391e6c fix VCS version 2014-08-15 12:09:16 +04:00
mshabunin
3ed89a8879 Merge with master and fix conflicts 2014-08-13 18:24:11 +04:00
arc
3d0a270a66 Merge branch 'master' into python2and3 2014-08-07 01:04:26 -04:00
Alexander Alekhin
fc0f254f00 make distrib with world (shared libs) 2014-08-05 20:37:18 +04:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
Michael Pratt
c9876c3cd8 Merge branch 'master' into python2and3 2014-07-31 01:13:16 -04:00
Vadim Pisarevsky
fc41e8850b Merge pull request #2836 from s98felix:2.4 2014-07-25 12:59:41 +00:00
Lars Glud
4dcd37f699 Merge remote-tracking branch 'origin/master' into Openni2Support 
Conflicts:
	modules/highgui/CMakeLists.txt
	modules/highgui/include/opencv2/highgui.hpp
	modules/highgui/include/opencv2/highgui/highgui_c.h
 2014-07-20 14:28:10 +02:00
Lars Glud
8b32235854 Openni2 support 2014-07-16 12:37:53 +02:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Roman Donchenko
023102c804 cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both 
How this worked before, I do not know.
 2014-07-09 16:55:40 +04:00
Marvin Smith
14548227ca Adding support for GDAL raster images. 2014-07-01 16:29:11 -07:00
Michael Pratt
cac1218eef Build both Python 2 and Python 3 bindings 
If both Python 2 and Python 3 are found, then build bindings for both of
them during the build process.  Currently, one version of Python is
detected automatically, and building for the other requires changes the
CMake config.

The largest chunk of this change generalizes OpenCVDetectPython.cmake to
find both a Python 2 and Python 3 version of Python.  Secondly, the
opencv_python module is split into two modules, opencv_python2 and
opencv_python3.  Both are built from the same source. but for different
versions of Python.
 2014-06-29 20:08:13 -04:00
Andrey Pavlenko
724f5e7f19 Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
Richard Yoo
11a09ef5cc Changes to support Intel AVX/AVX2 in cvResize(). 2014-06-06 15:39:09 -07:00
Alexander Alekhin
15b6fd2ec4 android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
Tony
f0887a99e2 On branch gtk3 
Changes to be committed:
	modified:   CMakeLists.txt
Corrected merge error from last resync
 2014-06-03 21:29:54 +01:00
Tony
512cb4fced Correction to enable compilation on platform with only GTK2 libs 
modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
 2014-04-12 22:43:42 +01:00
Tony
47d4f8cd61 Merge remote-tracking branch 'upstream/master' into gtk3 
Conflicts:
	CMakeLists.txt
 2014-04-10 20:10:28 +01:00
Tony
2f9dad5ce8 Correct error with GTK3 not found selection 
When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.

Changes committed:
	modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
 2014-04-09 22:07:59 +01:00
Alexander Alekhin
1461ab41bc ipp: added support for updated ICV package 2014-04-09 18:20:49 +04:00
Tony
838bb4bdeb Fix bug in GTK+3 logic introduced by previous merge 
During merging of conflicting versions of this file, I erroneously
deleted several lines in the GUI reporting section. This is repaired
in this commit.
 2014-04-08 21:21:40 +01:00
Tony
d60be58a92 Merge remote-tracking branch 'upstream/master' into gtk3 
Conflicts:
	CMakeLists.txt
 2014-04-08 19:25:51 +01:00
Andrey Pavlenko
9ec823d800 Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert 2014-04-08 11:05:30 +04:00
Alexander Alekhin
bfc546d23c enable IPP ICV support 2014-04-03 15:05:38 +04:00
Elena Gvozdeva
fa2d79a15b Added IPP Async converters, doc and sample 2014-04-01 16:47:29 +04:00
Tony
7f671406db Use GTK_VERSION_MAJOR to switch between GTK+ version two and three 
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.

The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
 On branch gtk3
 Changes to be committed:
        modified:   CMakeLists.txt
        modified:   cmake/OpenCVFindLibsGUI.cmake
        modified:   cmake/templates/cvconfig.h.in
        modified:   modules/highgui/src/window.cpp
        modified:   modules/highgui/src/window_gtk.cpp
 2014-03-31 22:05:09 +01:00
Tony
46ba9d30b9 Merge remote-tracking branch 'upstream/master' 2014-03-25 20:44:06 +00:00
Roman Donchenko
cc05493730 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectAndroidSDK.cmake
	cmake/OpenCVGenAndroidMK.cmake
	cmake/OpenCVModule.cmake
	cmake/templates/OpenCV.mk.in
	cmake/templates/OpenCVConfig.cmake.in
	doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
	modules/cudabgsegm/src/cuda/mog.cu
	modules/imgproc/perf/opencl/perf_filters.cpp
	modules/imgproc/src/opencl/filterSep_singlePass.cl
	modules/nonfree/CMakeLists.txt
	modules/nonfree/perf/perf_precomp.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/opencl/bgfg_mog.cl
	modules/superres/CMakeLists.txt
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/cuda/btv_l1_gpu.cu
	modules/superres/src/frame_source.cpp
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	samples/gpu/CMakeLists.txt
	samples/gpu/brox_optical_flow.cpp
	samples/gpu/super_resolution.cpp
 2014-03-24 19:02:16 +04:00
Alexander Smorkalov
3b65b710b6 Implicit linkage with CUDA runtime reverted. 2014-03-21 17:58:59 +04:00
Alexander Smorkalov
284b2fc1e7 Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path. 2014-03-19 18:47:32 +04:00
Roman Donchenko
48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
 2014-02-25 15:02:24 +04:00
Roman Donchenko
1cf75c0cab Hardcode iOS's endianness, since the TestBigEndian module doesn't work there 2014-02-24 12:13:35 +04:00
Alexander Smorkalov
de6d13088f gcov tool support added. 2014-02-18 12:59:41 +04:00
Roman Donchenko
029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
 2014-02-17 15:24:05 +04:00
Roman Donchenko
fa272c43c2 Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host 2014-02-14 15:37:09 +04:00
Stuart Cunningham
55b9c0374c Fix cmake detection of build platform endianness 
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
 2014-02-13 22:59:30 +11:00
Ilya Lavrenov
879c0196d4 enabled OpenGL on MacOSX 2014-02-13 00:17:15 +04:00
Roman Donchenko
e55679079f Merge pull request #2320 from asmorkalov:ocv_readme_license_install 2014-02-12 16:27:24 +04:00
Alexander Smorkalov
d02c291160 opencv_run_all_tests.sh implemented for Android SDK. 2014-02-12 14:21:58 +04:00
Alexander Smorkalov
e55f2b2602 LICENSE and README files installation rules added. 2014-02-12 14:06:41 +04:00
Roman Donchenko
72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
 2014-02-11 12:05:01 +04:00
Roman Donchenko
4ab891e9e5 Merge pull request #2277 from asmorkalov:android_test_path_fix 2014-02-05 12:36:37 +04:00
Alexander Smorkalov
0cd0e4749b Tests install path fix for Android SDK. 2014-02-04 16:23:01 +04:00
Vadim Pisarevsky
b8c6adc569 Merge pull request #2178 from Nerei:viz_backport 2014-02-03 16:16:51 +04:00
Roman Donchenko
2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
 2014-02-03 13:23:59 +04:00
Alexander Smorkalov
d45350a06a opencv_run_all_tests.sh script added to -tests package. 2014-01-29 16:31:24 +04:00
Alexander Smorkalov
d9dc5ffa91 Multiple fixes for tests deb package build. 
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
 2014-01-28 16:32:26 +04:00
Alexander Smorkalov
39201e68e2 Code review notes fixed. 
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
 2014-01-27 18:47:09 +04:00
Alexander Smorkalov
f332cba14b OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added. 2014-01-27 15:49:24 +04:00
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
 2014-01-27 15:28:14 +04:00
Anatoly Baksheev
3dc2dbc17e VTK off by default 2014-01-26 14:48:29 +04:00
Alexander Smorkalov
7821fe2bde Initial Linux packages build rools for CPack. 2014-01-21 20:34:36 +04:00
Anatoly Baksheev
02ebc4368c Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style 2014-01-20 22:51:33 +04:00
Anatoly Baksheev
b0ca93b22c by default enabled tests vtk 2014-01-19 18:38:57 +04:00
Andrey Pavlenko
967703c3ac Merge pull request #2093 from SpecLad:merge-2.4 2013-12-31 00:26:22 +04:00
Séverin Lemaignan
9e13e3a5a4 [emscripten] Do not link to system libraries 
This is not meaningful when compiling to javascript, and causes warning
at linking stage.
 2013-12-30 14:04:36 +01:00
Roman Donchenko
7f795e964f Merge commit 'ee36717d' into merge-2.4 2013-12-30 16:49:39 +04:00
Roman Donchenko
ee36717db4 Merge pull request #2037 from GregoryMorse:patch-2 2013-12-27 12:11:52 +04:00
GregoryMorse
4880858119 Update CMakeLists.txt 
WinRT native C++ support allowing building of static libraries

Update CMakeLists.txt

Update OpenCVCRTLinkage.cmake

Update OpenCVCRTLinkage.cmake
 2013-12-26 19:45:21 +08:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
 2013-12-23 18:50:17 +04:00
Roman Donchenko
f22d9a232d Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda 2013-12-23 12:45:49 +04:00
Alexander Smorkalov
bc72f4d2a2 Code review fixes. 2013-12-23 11:34:46 +04:00
Roman Donchenko
6e22be4100 Merge pull request #2003 from vbystricky:intelperc_camera_2.4 2013-12-20 17:06:27 +04:00
Alexander Smorkalov
9941c6710d NEON instruction set control unified for regular and cross-compiler builds. 2013-12-20 16:02:37 +04:00
Alexander Smorkalov
5a5c82bb1d Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring. 2013-12-19 17:41:04 +04:00
Alexander Smorkalov
037ffcdf99 Dynamic CUDA support library reimplemented as OpenCV module. 2013-12-19 16:42:11 +04:00
Alexander Smorkalov
6da7c50fb5 Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime. 2013-12-19 10:27:38 +04:00
Alexander Smorkalov
442082eb0f Fixes for Android support. 2013-12-19 09:38:46 +04:00
Vladimir Bystricky
e8d2a9752b Add support Creative Senz3D camera by Intel Perceptual Computing SDK 2013-12-13 17:25:16 +04:00
Alexander Alekhin
cc69d4631a cmake: detect Direct 3D 11 2013-12-13 15:57:31 +04:00
Anatoly Baksheev
0e88733b13 updating Viz cmake (switched to WITH_VTK option) 2013-12-07 18:58:27 +04:00
Dirk Van Haerenborgh
8a48802dec Enable GStreamer 1.x support by default. 
GStreamer 1.x is universally available, and with 0.10 being deprecated,
there should be no reason to default to 0.10 stil.
 2013-12-06 10:20:29 +01:00
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Vladislav Vinogradov
51663f5612 enable CUDA support for android 2013-11-28 10:00:47 +04:00
Tony
69dc840583 mprove Gtk2/3 options in cmake 
Update to cmake files for to include minimum versions, and tidy up gtk operation.

Files updated:
CMakeLists.txt:
  WITH_GTK now uses Gtk3 by default. If not found then Gtk2 is used.
  WITH_GTK_2_X forces Gtk2.x use

cmake/OpenCVFindLibsGUI.cmake
  Updated selection logic to implement methodology described above.
  Implemented warning if Gtk3 not found (and not overridden)
  Implemented error if Gtk does not meet minimum required version

cmake/OpenCVMinDepVersions.cmake
  Added minimum Gtk version of 2.18.0
 2013-11-26 21:35:03 +00:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
Alexander Smorkalov
514e97223c Some hacks to build and run OpenCL on Qualcomm S800. 
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
 2013-11-22 16:13:38 +04:00
Roman Donchenko
104b14e0e0 Fixed CMake warnings/bugs caused by #1670 and #1714 
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.

Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
 2013-10-30 16:21:50 +04:00
Roman Donchenko
78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-28 13:38:25 +04:00
Roman Donchenko
76b904b022 Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES. 
The reasons for that are twofold:

1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:

   http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023

Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:

   http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022

I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)

I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
 2013-10-25 14:19:02 +04:00
Roman Donchenko
f82eb0f79c Add better OpenMP detection and make an option to enable it. 
Bug report and inspiration: http://code.opencv.org/issues/3328
 2013-10-22 18:47:37 +04:00
Roman Donchenko
4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
 2013-10-22 14:28:00 +04:00
Andrey Pavlenko
d50f0d2ed2 Merge pull request #1587 from alalek:opencl_khronos_headers 2013-10-18 18:41:13 +04:00
Alexander Alekhin
6344da9ac3 ocl: force to use Khronos OpenCL headers 2013-10-18 15:47:11 +04:00
Alexander Alekhin
83b7fbe376 cmake: cleanup OpenCVModules_TARGETS from cache 
This will allow to disable modules between cmake runs
 2013-10-17 23:43:33 +04:00
Alexander Alekhin
09f0e1777e cmake: fix linker deps for CUDA 2013-10-16 18:34:47 +04:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
Alexander Alekhin
74329ee416 cmake: revert CRT linkage option for MSVS 2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Roman Donchenko
f07769e9d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-08 17:57:23 +04:00
Tony
81d6842b8e These changes introduce Gtk3 support into the highgui module. 
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).

window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.

To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
 2013-10-02 21:16:40 +01:00
Alexander Alekhin
212ad97100 ocl: dynamic load of OpenCL libraries 
Support functions from OpenCL 1.1 / OpenCL 1.2
 2013-10-02 18:32:33 +04:00
Roman Donchenko
a71a891b93 Merge pull request #1451 from adrians:neon-pull2 2013-10-02 12:51:30 +04:00
Alexander Smorkalov
308fbeb04b Make libv4l support optional for testing purposes. 2013-09-30 12:44:59 +04:00
Alexander Smorkalov
c550e452f9 Merge pull request #1384 from hbristow:matlab_public 2013-09-19 10:25:02 +04:00
Adrian Stratulat
f9ea3772b0 Add compile option for enabling NEON 2013-09-14 13:32:20 +03:00
Roman Donchenko
160ab8415e Merge pull request #1330 from lenlen:plantuml 2013-09-13 14:31:01 +04:00
hbristow
530ad447bc Added fixes to CMakeLists.txt 2013-09-13 17:22:12 +10:00
antonella
5b2d557502 Added plantuml extension 
Aligned strings in CMakeList

Modified the check on plantuml extension

Some fixes

Moved find_host_program for plantuml script
 2013-09-12 10:41:21 +00:00
Roman Donchenko
03926fac20 Fixed finding Git when cross-compiling. 2013-09-11 17:54:34 +04:00
hbristow
cf078be3d6 Merge branch 'matlab' into matlab_public 
Conflicts:
	CMakeLists.txt
	README.md
  samples/
 2013-09-02 14:23:11 +10:00
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
 2013-08-27 19:15:47 +04:00
Roman Donchenko
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Roman Donchenko
67ae438dae Refactored NumPy detection. 
Most importantly, added support for multiple include directores,
but also did some general cleanup.
 2013-08-23 18:46:54 +04:00
Roman Donchenko
1a81da012d Removed old Python detection cruft. 
None of this should be relevant as of CMake 2.8.7.
 2013-08-23 18:46:51 +04:00
Roman Donchenko
9bb1a7d34d Merge pull request #1234 from SpecLad:ios-plist 2013-08-23 15:43:08 +04:00
Roman Donchenko
365def6090 Merge pull request #1323 from SpecLad:find-git 2013-08-23 14:48:22 +04:00
Roman Donchenko
5a32f0b6ca Merge pull request #1322 from SpecLad:terse 2013-08-23 12:11:41 +04:00
Roman Donchenko
6fed0e85c2 Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
 2013-08-22 18:17:19 +04:00
Roman Donchenko
880306f6d6 Don't search for Git ourselves - CMake can handle it now. 2013-08-22 13:28:17 +04:00
Roman Donchenko
e45526b9c0 Dropped the CMAKE_VERBOSE option. 
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
 2013-08-22 12:41:14 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
kamjagin
7ff07e94a3 Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME 2013-08-14 13:34:34 +02:00
Roman Donchenko
a23abef9bd Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now. 
In fact, I don't think we actually use it... but I kept the include,
just in case.
 2013-08-08 12:03:41 +04:00
Roman Donchenko
168e2a4ccb Removed CMake version checks that we don't need anymore. 2013-08-08 12:03:41 +04:00
Roman Donchenko
a87756e9b3 Bumped minimal CMake version to 2.8.7. 2013-08-08 12:03:30 +04:00
Roman Donchenko
a495bbb967 Added a new file for recording minimal dependency versions. 2013-08-07 13:56:09 +04:00
Roman Donchenko
5dd598fc6d Fix building the iOS framework after I dropped the VERSION macro. 
This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
 2013-08-06 18:56:36 +04:00
Roman Donchenko
dcaf923517 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/ffmpeg/ffmpeg_version.cmake
	cmake/OpenCVFindLibsGrfmt.cmake
	cmake/templates/cvconfig.h.cmake
	modules/bioinspired/doc/retina/index.rst
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/calib3d/src/precomp.hpp
	modules/contrib/src/inputoutput.cpp
	modules/contrib/src/precomp.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/types_c.h
	modules/core/src/drawing.cpp
	modules/core/src/precomp.hpp
	modules/core/src/system.cpp
	modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
	modules/features2d/doc/common_interfaces_of_feature_detectors.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/src/precomp.hpp
	modules/flann/src/precomp.hpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/src/precomp.hpp
	modules/gpu/test/test_imgproc.cpp
	modules/highgui/CMakeLists.txt
	modules/highgui/test/test_precomp.hpp
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/precomp.hpp
	modules/java/generator/src/cpp/Mat.cpp
	modules/legacy/src/precomp.hpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/ml/src/precomp.hpp
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/src/precomp.hpp
	modules/objdetect/include/opencv2/objdetect/objdetect.hpp
	modules/objdetect/src/cascadedetect.cpp
	modules/objdetect/src/hog.cpp
	modules/objdetect/src/precomp.hpp
	modules/objdetect/test/test_latentsvmdetector.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/opencl/objdetect_hog.cl
	modules/ocl/src/precomp.hpp
	modules/photo/src/precomp.hpp
	modules/stitching/src/precomp.hpp
	modules/superres/perf/perf_precomp.hpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	modules/superres/test/test_precomp.hpp
	modules/ts/include/opencv2/ts.hpp
	modules/video/src/precomp.hpp
	modules/videostab/src/precomp.hpp
	modules/world/src/precomp.hpp
 2013-08-06 13:56:49 +04:00
Alexander Smorkalov
63786c389f Warning and review notes fixes. 
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
 2013-08-02 04:10:56 -07:00
Alexander Smorkalov
6257df1c4b API restricted on WinRT partially removed from core. 
Additional CMAKE flag WITH_WINRT added.
 2013-07-31 05:43:51 -07:00
Roman Donchenko
abe4219256 Drop the legacy CMake options. 
3.0 seems like an appropriate time to do that.
 2013-07-22 18:49:38 +04:00
Roman Donchenko
4f9554eead Removed a few more unused configuration macros. 
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.

Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
 2013-07-10 18:29:11 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
 2013-06-19 15:25:37 +04:00
hbristow
804d0924c9 cmake now attempts to generate and compile a simple mex file at configure time and reports the working status of the generator and compiler, rather than just naively saying Matlab exists 2013-06-18 23:00:48 +10:00
Hilton Bristow
5d1944bace Added jinja framework for templates and base templates for functions and docs 2013-06-17 16:48:07 +10:00
Hilton Bristow
ac748747d4 FindMatlab.cmake in cmake find_package format 2013-06-17 16:48:06 +10:00
Hilton Bristow
ded45b4d1a Added basic ability to find Matlab installations. Added test cpp file under modules/matlab/test to test mex compiler within cmake 2013-06-17 16:48:05 +10:00
Roman Donchenko
0124902f42 Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-10 18:18:01 +04:00
Roman Donchenko
a954d3630f Add support for adding custom OpenCV modules. 2013-06-05 18:10:44 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
 2013-06-05 15:42:07 +04:00
Roman Donchenko
0ae40507e5 Merge pull request #928 from apavlenko:bugfix_3027 2013-05-29 17:10:48 +04:00
Andrey Pavlenko
e28f6fae49 fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF) 2013-05-29 12:51:26 +04:00
Alexander Smorkalov
20fef00a77 android -> plarforms/android 2013-05-27 11:10:38 +04:00
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
 2013-05-21 17:19:23 +04:00
Dominik Rose
66c9029fd5 libdc1394 - removed validation for msvc compiler in CMakeLists.txt 2013-05-15 12:15:16 +02:00
Dominik Rose
76d1fa0ef6 Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv into mingw-libdc1394-2-windows 2013-05-14 16:48:29 +02:00
Dominik Rose
23eb41d1be Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv into mingw-libdc1394-2-windows 2013-05-14 16:33:31 +02:00
Dominik Rose
86ec9b79fd libd1394 2.x support for mingw on windows added 2013-05-14 16:30:12 +02:00
Dominik Rose
9247ad634f libd1394 2.x support for mingw on windows added 2013-05-14 16:20:01 +02:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
f856f78ac0 Update CMake scripts to recognize Qt 5.0 2013-05-13 17:10:32 +04:00
Andrey Kamaev
b2ba8b9969 Drop old python interface 2013-04-12 19:37:40 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Andrey Kamaev
2c57445ffe Improve CMake checks for the OpenGL availability 
Issue #2868
 2013-04-04 11:57:00 +04:00
Andrey Kamaev
795a513ac4 Merge pull request #716 from asmorkalov:winrt 2013-04-03 15:39:58 +04:00
Alexander Smorkalov
a2561ee0cd Code review notes fixed. 2013-04-03 04:14:40 -07:00
Alexander Smorkalov
4703f4552a Experimental MS Media Foundation API support added 2013-04-02 18:10:55 -07:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Alexander Smorkalov
09bc99a0c0 HAVE_WIN32UI and HAVE_VFW checks and defines added. 2013-03-27 08:03:51 -07:00
Alexander Smorkalov
6f68640d4d Multiple fixes for WinRT 
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
 2013-03-26 17:19:52 -07:00
Andrey Kamaev
a3e31a69df Merge pull request #684 from vhdirk:gstreamer-1.x 2013-03-25 17:01:43 +04:00
Anatoly Baksheev
7fa01e3fcc enabled png and jpeg for iOS 2013-03-25 11:19:29 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev
91ac9688a8 Allow OpenCL acceleration in every OpenCV module 2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0 Refactor OpenCL search 2013-03-21 17:56:59 +04:00
Andrey Kamaev
2afad8b575 Turn on OpenCL by default 2013-03-21 17:56:57 +04:00
Dirk Van Haerenborgh
4f3453dbbf bomb commit of gstreamer videocapture and videowriter 2013-03-21 10:22:56 +01:00
Alexander Smorkalov
429cd85b46 More accurate guards for WinRT features in CMake. 2013-03-20 12:21:29 -07:00
Alexander Smorkalov
3d594c70ff Multiple Windows RT fixes 
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
 2013-03-19 17:46:01 -07:00
Alexander Smorkalov
06aff4e7b0 Initial Windows RT support commit. 
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
 2013-03-13 09:02:15 -07:00
Andrey Kamaev
fb76095378 Merge pull request #610 from AoD314:webp2 2013-03-11 21:13:36 +04:00
AoD314
63d9ee9523 This code is based on https://github.com/prasannatsm/opencv code. 
- added webp (lossy and lossless without alpha channel)
- added tests
 2013-03-11 11:51:38 +04:00
Andrey Kamaev
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +04:00
Andrey Kamaev
facab40745 Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown 2013-03-01 19:44:17 +04:00
Andrey Kamaev
262fc929aa Merge branch '2.4' 2013-02-18 15:35:42 +04:00
Vladislav Vinogradov
78c924baad removed obsolete CARMA toolchain and CMake variable 2013-02-14 16:27:17 +04:00
Andrey Kamaev
c7df17e77b Detect and report parallel framework used 2013-02-13 15:09:30 +04:00
Andrey Kamaev
0b20faf3d2 Use git describe to get source control version 2013-02-13 14:50:32 +04:00
Andrey Kamaev
9e4792af1f Add separate status section for java 2013-02-13 14:36:56 +04:00
Andrey Kamaev
82313b3f6c Add OpenCL section to status report 2013-02-13 14:27:12 +04:00
Andrey Kamaev
247df9f3fc Detect version of clang compiler 2013-02-13 14:11:56 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Andrey Pavlenko
b337d84adf configure desktop Java install, making JNI library name correct, and making it fat when possible 2013-02-11 16:28:19 +04:00
Alexander Smorkalov
7882aba7af TBB download and build option enabled for non Android platfroms. 2013-02-06 14:43:57 +04:00
Alexander Smorkalov
75191e8f2f Smartek Giganetix Cameras support (Patch #2192) integrated to master. 2013-02-01 16:54:00 +04:00
Andrey Kamaev
7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Andrey Kamaev
3dbb98e454 Merge pull request #357 from taka-no-me:build_opencv_apps 2013-01-29 19:25:52 +04:00
Andrey Kamaev
c78cb21999 Merge pull request #346 from taka-no-me:decouple_V4L2 2013-01-29 19:25:30 +04:00
Andrey Kamaev
daead680cd Add option to control build of applications (feature #2568) 2013-01-29 16:38:59 +04:00
cuda-geek
11dfceb2c9 Merge pull request #328 from jet47:new-gpu-fixes 2013-01-29 11:00:37 +04:00
Andrey Kamaev
cf407c2ec0 Don't check for EINTR and replace xioctl with ioctl 
This should be safe todo unless we are writing a signal handler.
 2013-01-28 17:58:57 +04:00
Patrick Welche
d90b8d615c NetBSD video(4) support, patch 1 of 3 
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
 2013-01-28 17:11:36 +04:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Andrey Kamaev
b445f4b01d Find OpenCL in AMD APP SDK 2013-01-25 14:15:26 +04:00
Vladislav Vinogradov
395f0201e3 fixed build for CARMA: 
- added CMake toolchain file
- added WITH_NVCUVID flag
 2013-01-23 21:05:08 +04:00
Andrey Kamaev
dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +04:00
Andrey Kamaev
3cb84ed17c Fix dependencies inference for auto-disabled targets 
Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report
 2013-01-14 18:58:24 +04:00
marina.kolpakova
e53d57664d fix precompiled headers usage in gpu module 2012-12-30 16:58:41 +04:00
Andrey Kamaev
13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
marina.kolpakova
3882bbbf35 improve carma build 
- exclude system paths from library search paths
 - remove hardcoded paths to compiler
 - enable compiling with 3d-parties
 - enable build as shared libraries
 2012-12-24 14:54:57 +04:00
Vladislav Vinogradov
5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev
d6d1d20816 Show STL type in CMake status report 2012-12-22 22:52:27 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Vladislav Vinogradov
2f1ca1b6b3 fixed build for CARMA: 
* added CMake toolchain file
* added WITH_NVCUVID flag
 2012-12-21 13:45:50 +04:00
Alexander Smorkalov
1555922228 OpenCV for Android SDK installation improved; 
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
 2012-12-19 17:28:46 +04:00
Andrey Kamaev
ae5649d3f7 Drop unsupported imageio from grfmt 2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902 Revert incompletely applied patch from #2192 
This reverts commit 2e7656dbdf.
 2012-12-03 09:55:53 +04:00
Alexander Smorkalov
5b148083fe Libinfo build fix; 
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
 2012-11-20 17:39:45 +04:00
Andrey Kamaev
0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Alexander Smorkalov
dda2eb0f76 Libinfo build fix; 
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
 2012-11-12 12:57:09 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
4a2f626d85 Remove "-rc" suffix from version 2012-11-02 14:27:34 +04:00
Alexander Smorkalov
fc085d9dbd info library for OpenCV added. 2012-10-31 20:48:37 +04:00
Alexander Smorkalov
da31e12fed CMake for OpenCV Manager updated; 
Some repo normalization problems fixed;
Deprecated cmake keys removed;
Warning fixed.
 2012-10-31 11:47:27 +04:00
Andrey Kamaev
6f08d03322 Advance version number to 2.4.3-rc 2012-10-23 17:59:59 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
7225f89ea2 Revert opencv_videostab to the state of 2.4.2 2012-10-17 02:09:43 +04:00
Evgeny Talanin
2e7656dbdf #2192 patch apply 2012-10-12 13:03:43 +04:00
Anatoly Baksheev
1d68850cb2 Added CUDA fast math flag 2012-10-10 22:16:51 +04:00
Vadim Pisarevsky
e625d86485 added C= support; modified threading logic in threshold 2012-10-10 15:36:32 +04:00
Andrey Pavlenko
3c4917555d fixing git commit getting for Android build 2012-09-17 17:08:48 +04:00
Andrey Kamaev
f32eb05ea1 Fix AVX and other SIMD support detection 2012-09-17 13:30:28 +04:00
Andrey Kamaev
fe0d07ae53 Add experimental support for desktop Java 
Based on pull request #31 (thanks to Eric Christiansen)
Support for Java is turned off by default and can be enabled setting
BUILD_opencv_java to ON (e.g. cmake -DBUILD_opencv_java=ON ..)
 2012-09-17 13:21:20 +04:00
Andrey Kamaev
ece71d6a06 Remove misused REQUIRED keyword from CMake scripts 2012-09-17 13:21:20 +04:00
Andrey Kamaev
867777f825 Added OpenEXR library v1.7.1 2012-09-02 20:44:04 +04:00
Vadim Pisarevsky
a6e2acbfee added a few missing images for tutorials; integrated pull request #26 2012-08-30 16:23:18 +04:00
Anatoly Baksheev
0ba01afd83 added GPU bilateral filter + tests 
added GPU non local means brute force filter + tests
 2012-08-29 19:20:32 +04:00
Andrey Kamaev
bcf8dd510f Added CCache support to Android build 
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:

export NDK_CCACHE=ccache
 2012-08-27 18:22:00 +04:00
Anatoly Baksheev
d3f4c9b2dc Fixed bug in BP_GPU 2012-08-24 18:38:54 +04:00
Anatoly Baksheev
290030d030 possibility to enable /mp compiler flag from cmake 
fixed MCVC warnings
 2012-08-23 16:53:53 +04:00
Andrey Kamaev
f2a02feffa Fix Windows build issues 
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
 2012-08-22 11:21:09 +04:00
Vadim Pisarevsky
2f1cc018c9 enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays) 2012-08-21 17:39:40 +04:00
Sergiu Dotenco
ddc7bd7659 fixed compilation errors caused by std::tuple 2012-08-19 15:30:41 +02:00
Andrey Kamaev
bd33e166d0 Use git hash instead of svn version in cmake status report 2012-08-07 14:30:36 +04:00
yao
c03ac12fcd Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries 2012-08-07 16:33:46 +08:00
Vadim Pisarevsky
9f4efab40a merged ocl module from ocl branch (it's not quite usable yet; at least on Mac) 2012-07-16 17:08:14 +00:00
Andrey Kamaev
6a13c9efc0 Added cmake for building Android package 2012-06-28 13:42:08 +00:00
Andrey Kamaev
15e50420bc Fixed linux and android install 2012-06-27 13:52:29 +00:00
Andrey Kamaev
a323da6fd5 Fixed some warnings and install problems on linux 2012-06-27 12:02:31 +00:00
Andrey Pavlenko
3804ca3e20 changing package layout after 'make install' for Android build 2012-06-27 06:22:26 +00:00
Andrey Kamaev
55567582a6 added XIMEA support for linux (by Igor Kuzmin) #2085 2012-06-26 11:48:58 +00:00
Andrey Kamaev
a142a3b78a Fixed Android Manager build 2012-06-26 08:48:45 +00:00
Andrey Pavlenko
2984fa751e adding OpenCV Manager 2012-06-21 14:50:05 +00:00
Andrey Kamaev
37212f5e00 Fixing compiler flags checks. 2012-06-12 15:14:28 +00:00
Andrey Kamaev
79df8db76f Fixed recently introduced build problems on some platforms 2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Andrey Kamaev
5b2db8e75b Dragonfly BSD build fix #2010 (thanks to Thomas Klausner) 2012-06-04 06:19:56 +00:00
Andrey Kamaev
ca6d2fe76b Moved 3rd-party libraries detection to separate cmake files 2012-05-25 13:12:02 +00:00
Andrey Kamaev
e161f428a0 Fixed PvAPI search on Windows #1927 2012-05-24 20:10:13 +00:00
Andrey Kamaev
0716ebb7a6 Refactored highgui libraries search (tested on Windows only) 2012-05-20 18:49:57 +00:00
Andrey Kamaev
094c32ced7 Refactored CMake status report for video IO libs 2012-05-19 13:48:36 +00:00
Andrey Kamaev
d069c062a6 Added Windows paths support to Eigen search. 2012-05-19 10:14:10 +00:00
Vadim Pisarevsky
9bbcebd6b0 added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu. 2012-05-12 13:54:26 +00:00
Vladislav Vinogradov
91e312958b disabled WITH_OPENGL flag under MacOS 2012-05-10 09:53:57 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Alexey Spizhevoy
306248e444 Added support of Clp for Windows 2012-04-16 11:10:41 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Alexey Spizhevoy
020f9a6047 Updated Clp library related code in CMakeLists.txt 2012-04-13 11:55:12 +00:00
Alexey Spizhevoy
ae839df55d Added WITH_CLP flag support into cmake scripts. 2012-04-11 12:34:30 +00:00
Andrey Kamaev
c648de0e08 Fixed build error in Android examples when java bindings are excluded from build. 2012-03-31 12:26:03 +00:00
Andrey Kamaev
63c6e9d6d2 #1537 removed suspicious lines clearing optimization flags 2012-03-28 13:59:48 +00:00
Andrey Kamaev
3ac1f31126 Fixed Android tests and samples status in cmake report; restored java tests "coverage calculation". 2012-03-27 21:27:27 +00:00
Andrey Kamaev
e72a23243b Reworked build scripts for Android Java API, tests and examples 2012-03-27 16:05:52 +00:00
Alexander Shishkov
6412e17df6 fixed #1502 2012-03-26 18:58:01 +00:00
Andrey Kamaev
8991d323ea Refactored Java wrapper build scripts. 
Improved Android SDK search, fixed some bugs.
 2012-03-25 19:57:58 +00:00
Andrey Kamaev
9b2d7e19db Added "fat" mode for Java wrapper 2012-03-23 17:03:05 +00:00
Alexander Reshetnikov
0dd4386d77 Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file 2012-03-21 18:07:34 +00:00
Andrey Kamaev
2e03e6c06c Solution folders are turned on by default for MS Visual Studio IDE. 2012-03-19 18:47:27 +00:00
Andrey Kamaev
305d024137 CMake status report: list unsatisfied dependencies for automatically disabled modules; fixed few problems with Windows-style paths 2012-03-16 09:16:31 +00:00
Vadim Pisarevsky
b5a9c9ac77 temporarily turned off the new wrapper. 2012-03-15 19:58:35 +00:00
Alexander Reshetnikov
36b2ff3cf3 Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows 2012-03-15 09:24:03 +00:00
Alexander Reshetnikov
e0b772a392 Added a first version of new ffmpeg wrapper 2012-03-12 17:07:54 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Anatoly Baksheev
18933c12f7 Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration 2012-03-02 14:48:35 +00:00
Andrey Kamaev
2f4bb580fc Fixed some build warnings; slightly improved python search 2012-03-02 08:34:54 +00:00
Andrey Kamaev
8df208cf56 Fixed compiler flags for 3rdparty libs. 2012-02-24 21:54:29 +00:00
Andrey Kamaev
8141a5026c Refactored cmake for 3rdparty libs 2012-02-24 13:53:22 +00:00
Andrey Kamaev
a8f0c93379 Modified zlib search. Use system zlib on Android by default 2012-02-24 12:23:34 +00:00
Andrey Kamaev
eec70a7793 Architecture dependent library path on unix 2012-02-22 15:29:23 +00:00
Andrey Kamaev
4ac407e76a Small refactoring of OpenCV cmake options 2012-02-22 14:04:59 +00:00
Andrey Kamaev
a8f27e4a84 Information about cmake and build platform is added to the status report 2012-02-21 12:42:51 +00:00
Andrey Kamaev
a6e8e5dd95 Fixed #1443 2012-02-17 19:09:05 +00:00
Andrey Kamaev
691d392312 Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005. 2012-02-16 20:29:35 +00:00
Leonid Beynenson
3ef5bfa185 Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue. 2012-02-09 15:02:21 +00:00
Andrey Kamaev
49933c798f Fixed build for desktop 2012-02-06 11:48:15 +00:00
Andrey Kamaev
23af203e00 Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts 2012-02-06 11:30:59 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization: 
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
 2012-02-03 11:26:49 +00:00
Vadim Pisarevsky
fd084a0a7e fixed bug #1415 2012-01-27 20:36:19 +00:00
Vadim Pisarevsky
b33c9b10bc fixed bug #1566 2012-01-27 20:28:59 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +00:00
Andrey Kamaev
6f99447fbf Fixed compiler flags caching in cmake 2012-01-24 11:46:11 +00:00
Andrey Kamaev
8cab65c173 Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options. 2012-01-03 13:48:12 +00:00
Andrey Morozov
209aaac95c fixed parallel build under Windows 2011-12-19 13:20:34 +00:00
Andrey Morozov
ca5d28d127 added experimental feature for parallel build solution under Windows 2011-12-16 07:14:55 +00:00
Vladislav Vinogradov
3afc97e67e fixed new OpenGL functionality under Qt 2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
2a4fb155e1 added OpenGL support to Gtk realization of highgui 2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3 fixed build with Qt 2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
c2783af781 added OpenGL support to highgui under WIN32 2011-11-21 11:58:52 +00:00
Andrey Kamaev
d45f561ef5 Small improvements in cmake status report 2011-11-18 08:14:42 +00:00
Andrey Kamaev
a13dfc7f70 Fixed perf target 2011-11-18 07:57:14 +00:00
Andrey Kamaev
3bdb53e484 Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support. 2011-11-16 14:32:10 +00:00
Leonid Beynenson
59d89c7a7a Added possibility to configure TBB behavior in Perf tests --- now we can set the number of TBB threads in the perf tests either as console parameter perf_tbb_nthreads or 
in a test itself using the method declare.tbb_threads(n).
 2011-10-31 16:22:05 +00:00
Vladislav Vinogradov
40ee754e28 added WITH_CUFFT and WITH_CUBLAS flags to cmake scripts 
fixed gpu module error reporting
added asynchronous version of some functions
 2011-10-19 09:53:22 +00:00
Alexander Shishkov
bb130d14bd Changed type of OPENCV_BUILD_3RDPARTY_LIBS variable to the INTERNAL on WIndows 
(see comments for #1030 ticket https://code.ros.org/trac/opencv/ticket/1030)
 2011-10-03 16:59:24 +00:00
Leonid Beynenson
fcaa587b67 CMake scripts changed a bit: added more accurate variant of the Threading Framework support (it is a lightweight analogue of TBB for ARM-s). 2011-09-27 16:25:13 +00:00
Andrey Kamaev
fb2c288627 Fixed some cmake 2.6 compatibility issues. 2011-09-18 15:30:36 +00:00
Andrey Kamaev
1917d8b006 Fixed perf target on Windows. 2011-09-08 06:27:46 +00:00
Andrey Kamaev
5cce038958 Performance testing branch is merged back into trunk 2011-09-06 15:30:28 +00:00
Andrey Kamaev
1f0035d2af Fixed native_camera library build for Androids having version in x.x format 2011-09-01 14:39:26 +00:00
Artem Myagkov
abdd342d50 modifed minimum required cmake version for ios 2011-08-31 18:42:44 +00:00
Artem Myagkov
3a3bc18381 modified capturing building ligic for iOS 2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial 2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
3b7b833a4e merged latest fixes from 2.3 branch; since 2.3.1 is out, the version in trunk is bumped to 2.3.2 2011-08-17 20:12:11 +00:00
Vadim Pisarevsky
d752c2b674 disabled fast-math by default. 2011-08-17 09:05:05 +00:00
Vadim Pisarevsky
bd0d8429ee added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor. 2011-08-11 17:59:30 +00:00
Maria Dimashova
04e4eaabaf updated openni finding by cmake (#1190, #1252); updated doc on kinect 2011-08-10 14:58:55 +00:00
Vadim Pisarevsky
f9ef92d45a multilib support added (ticket #363) 2011-08-10 12:49:52 +00:00
Maria Dimashova
7f1995f19a fixed cmake status of openni 2011-08-10 11:59:37 +00:00
Andrey Kamaev
a0590273e9 Java API: fixed problems in video and ml modules; generated test stubs for all exported functions (now we have 1701 tests). 2011-08-05 08:39:28 +00:00
Andrey Kamaev
99b8e2db14 Java API: added tests for FAST feature detector 2011-08-02 14:32:43 +00:00
Vadim Pisarevsky
7c54ebfe1b corrected OpenEXR status in CMakeLists.txt 2011-07-27 20:53:19 +00:00
Andrey Kamaev
8ab16f66a8 Fixing native camera for Android 2011-07-25 11:16:32 +00:00
Andrey Kamaev
a17b693aa9 Fixed build of Android samples and tests 2011-07-24 20:44:20 +00:00
Andrey Kamaev
712ea05058 Refactored CMakeLists.txt for java module 2011-07-22 13:10:50 +00:00
Andrey Kamaev
078eae7154 Added cmake dependency on version.hpp. From now cmake will automatically rerun if version.hpp file is changed. 2011-07-21 21:44:48 +00:00
Andrey Kamaev
f503b029a7 Allowed to build html documentation without pdf documentation. 2011-07-19 20:27:58 +00:00
Andrey Kamaev
066039fd15 Improved ANDROID_SDK_TARGET detection; improved NDK detection in android.toolchain.cmake 2011-07-13 13:06:14 +00:00
Andrey Kamaev
6c668dd704 Fixed Android SDK searching 2011-07-13 09:17:41 +00:00
Andrey Kamaev
355f6d0a73 Fixed Android SDK searching 2011-07-13 09:10:21 +00:00
Andrey Kamaev
6623fe3b08 Added option INSTALL_ANDROID_EXAMPLES (default off); Added option for choosing SDK platform for Android tests and samples. 2011-07-12 15:59:31 +00:00
Vadim Pisarevsky
569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Andrey Kamaev
2dd965b7f5 minor cmake corrections 2011-07-12 07:40:29 +00:00
Alexander Shishkov
b50428bf65 removed -static-libstdc++ flag for compatibility with old MinGW version 2011-07-08 07:10:37 +00:00
Alexander Shishkov
3a8a729a52 removed CPack 
added target package_source (tar or zip)
 2011-07-08 07:08:59 +00:00
Vadim Pisarevsky
af00cd5b75 Disabled -ffast-math in the case of GCC 4.6.x (ticket #1201) 2011-07-07 22:35:34 +00:00
Vadim Pisarevsky
db0dcaffeb fixed #1204 2011-07-07 22:10:13 +00:00
Andrey Kamaev
ff8fe39e23 removed duplicated compiler flags assignment 2011-07-05 06:42:56 +00:00
Vadim Pisarevsky
b33224f0b6 merged the latest fixes in 2.3 to trunk 2011-07-04 16:18:12 +00:00
Andrey Kamaev
730622178b Turned off android camera and java wrappers for low Android API levels (android-8 is required for these components) 2011-07-04 11:41:39 +00:00
Andrey Kamaev
d96f533784 Instroduced separate option for Android examples - BUILD_ANDROID_EXAMPLES 2011-07-04 08:18:02 +00:00
Andrey Kamaev
1c96aac52e Fixed several cross-compiling issues. Fixed cmake status report. 2011-07-02 15:12:07 +00:00
Vadim Pisarevsky
f8e1e88ce2 we do not need strmiids.lib anymore 2011-07-01 14:03:03 +00:00
Andrey Kamaev
837b733a0a Modified cmake status report 2011-07-01 12:23:03 +00:00
Vadim Pisarevsky
3cbe53c5d2 got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll) 2011-07-01 12:14:51 +00:00
Ethan Rublee
08d3dcc709 minor edits to cmake. 2011-07-01 00:57:00 +00:00
Ethan Rublee
38b5d4ecc9 Adding namemangling to the opencv.pc file. 2011-07-01 00:14:09 +00:00
Andrey Kamaev
529f103456 Merged name suffixes for windows (from 2.3 branch) 2011-06-30 19:45:52 +00:00
Andrey Kamaev
092699783a Added cmake script to build Android samples 2011-06-30 13:37:56 +00:00
Andrey Kamaev
aa47802e88 Modified version section to read version number from version.hpp; 
Added search for ant and Android SDK (needed for Android tests and samples).
 2011-06-30 07:24:35 +00:00
Andrey Kamaev
96d29621b7 Fixes for path mangling feature 2011-06-29 06:27:08 +00:00
Ethan Rublee
773654e11a More work on the mangling of install paths. 2011-06-28 19:24:31 +00:00
Ethan Rublee
6259c9ac6a First pass at name mangling based on version number, to support 
side by side installs of OpenCV2.3.0 OpenCV2.3.1 OpenCV2.4.x, etc...
 2011-06-28 16:02:09 +00:00
Andrey Kamaev
f60bdb2473 Fixed Android.mk file generation 2011-06-28 08:48:23 +00:00
Andrey Kamaev
822b0bfe22 Minor bugfix 2011-06-28 07:20:30 +00:00
Andrey Kamaev
591cb1b3cf Fixed compiler options in Android build (Windows) 2011-06-28 05:51:41 +00:00
Andrey Kamaev
ba7ee71c20 Numerous small fixes in CMakeLists.txt 2011-06-28 05:18:53 +00:00
Andrey Kamaev
cf28846bce Fixed OpenCVConfig.cmake generation for windows 2011-06-27 16:55:10 +00:00
Andrey Kamaev
31fcd406e1 Eliminated cmake warning for case when python is not found. 2011-06-27 16:21:22 +00:00
Andrey Kamaev
b43ae03328 * Install path share/opencv is renamed to share/OpenCV. 
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
 2011-06-27 13:59:03 +00:00
Andrey Kamaev
f0227edd2c Minor python search improvements 2011-06-27 08:24:10 +00:00
Vadim Pisarevsky
d195871904 propagated fix for ticket #1168 to trunk 2011-06-25 09:39:41 +00:00
Andrey Kamaev
c1940b4ec7 Modified install layout for Android 2011-06-24 15:40:27 +00:00
Andrey Kamaev
69b79f89c1 Updated build scripts for better Java module support 2011-06-24 07:48:04 +00:00
Andrey Kamaev
e60b8dfba0 Fixed numpy search on Windows x64 2011-06-23 09:16:55 +00:00
Andrey Kamaev
9600ebadf2 Main CMakeLists.txt merged with 2.3 branch 2011-06-22 11:53:15 +00:00
Andrey Kamaev
76bc9f8c20 Removed SWIG from Android toolchain; always search for python; find_program/find_package cmake functions wrapped for case of cross-compiling. 2011-06-22 10:38:57 +00:00
Andrey Kamaev
ea58cdc71d (trunk) Do not use prebuilt Android camera libs for armeabi hardware target 2011-06-20 15:57:42 +00:00
Andrey Kamaev
9c71134caf Added generation of OpenCV.mk file for Android development with ndk-build tool 2011-06-20 15:35:05 +00:00
Vadim Pisarevsky
151bfb2ae2 use "-O2 -DNDEBUG" in release by default in the case of MinGW 2011-06-18 13:09:57 +00:00
Alexander Shishkov
d198e39d35 set default compiler flags to "-O2" in the case of MinGW 2011-06-17 15:44:05 +00:00
Andrey Morozov
840baa2205 improved build of installer package for windows 2011-06-17 15:02:10 +00:00
Andrey Kamaev
e722cb96e7 Added cmake file to compile Android native camera wrapper if Android source tree is available 2011-06-17 13:52:55 +00:00
Alexander Shishkov
0ec452c152 turned off Python support for Windows in Debug mode 2011-06-17 13:12:21 +00:00
Alexander Shishkov
78dcb42822 fixed compilation on Linux in static case 2011-06-17 12:53:57 +00:00
Andrey Kamaev
6e8b4e646a Fixed Android install target 2011-06-17 11:10:35 +00:00
Andrey Kamaev
206aa50f86 Added Android native camera module 2011-06-16 18:00:41 +00:00
Vadim Pisarevsky
35d5a671a2 little fix: "and" => "AND" 2011-06-16 10:20:26 +00:00
Vadim Pisarevsky
17b18de531 added missing evcode.h; made videoinput optional (ticket #1142) 2011-06-16 09:51:34 +00:00
Vadim Pisarevsky
412e7a835f videoInput is now integrated into highgui and built from sources 2011-06-15 22:59:41 +00:00
Vadim Pisarevsky
4b4e30f6c1 fixed gcc dwarf2 check 2011-06-15 17:34:43 +00:00
Alexander Shishkov
13a9129d20 turned off WITH_VIDEOINPUT for mingw with dwarf2 2011-06-15 15:59:50 +00:00
Anatoly Baksheev
117ff43cc3 default cuda target flags changed 
cuda support is on by default
 2011-06-15 08:05:34 +00:00
Alexander Shishkov
6ecebb7f66 fixed #768 ticket 
renamed OPENCV_SOURCE_DIR to OpenCV_SOURCE_DIR
 2011-06-14 10:19:56 +00:00
Alexander Shishkov
ca758a9dac fixed #768 ticket 2011-06-14 10:11:16 +00:00
Anatoly Baksheev
8f4c7db3f6 ~40 warnings under VS2008 
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
 2011-06-11 17:24:09 +00:00
Alexander Shishkov
97ae8f7af7 added BUILD_WITH_STATIC_CRT option for static linking with CRT on MSVC 2011-06-06 10:26:59 +00:00
Andrey Kamaev
c7bdf83de5 Fixed Android build 2011-06-03 12:01:55 +00:00
Anatoly Baksheev
e4bbcdac17 minor 2011-06-01 08:01:04 +00:00
Alexander Shishkov
6f6da53c64 added SSE compiler flags under Windows+MSVC (ticket #371) 2011-05-31 15:50:16 +00:00
Alexander Shishkov
6aabf72bc5 removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS 2011-05-31 13:17:59 +00:00
Ethan Rublee
76538fbe6b Making the install and lib, bin directories consistent. 2011-05-30 22:13:32 +00:00
Alexander Shishkov
33e71127f7 fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket #573) 2011-05-30 13:32:57 +00:00
Vadim Pisarevsky
9336b700ba use FindZLIB(), FindJPEG() etc. on MacOSX as well to avoid possible conflicts with MacPorts. 2011-05-27 13:47:18 +00:00
Maria Dimashova
33493f4e19 renamed WITH(HAVE)_EIGEN2 to WITH(HAVE)_EIGEN, fixed compilation error if eigen3 is used (#805) 2011-05-27 12:15:36 +00:00
Ethan Rublee
5c5cd449b3 Adding python default install path for debian vs mac. changing site-packages -> dist-packages. See python help 
for site. Also ticket #1087.
 2011-05-24 00:30:03 +00:00
Vadim Pisarevsky
306a11a7c5 fixed a few warnings from VS2010 express 2011-05-17 14:15:23 +00:00
Anatoly Baksheev
69f28ef65c solution folder flag disabled by default 2011-05-17 09:40:06 +00:00
Andrey Kamaev
9d787afe72 Small Android build fixes 2011-05-13 18:32:05 +00:00
Anatoly Baksheev
7a24dc9cb6 formatting 2011-05-11 14:45:35 +00:00
Anatoly Baksheev
c49dc37761 [+] added use_folders cmake feature if cmake version is greater then 2.8.0 
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
 2011-05-11 13:37:20 +00:00
Vadim Pisarevsky
a7b9c31e6a repaired opencv refman & refman1 build 2011-05-09 16:50:29 +00:00