aa96d8d053
Fix the name of perf tests' precompiled header.
2013-08-20 12:51:33 +04:00
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
6d7f29a03a
Made it so that a dummy .cpp is actually created when compiling with VC++.
2013-08-08 16:49:14 +04:00
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
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
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
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
33d1f67501
Include the OpenCV config headers into every module.
...
This has no bearing on compilation, but it makes them show up in IDEs.
2013-06-07 19:07:55 +04:00
985bfea556
Don't resolve symlinks when looking for modules.
...
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
2013-06-05 17:17:13 +04:00
caa9ac4ed9
fix installation of main module headers
...
see: http://code.opencv.org/issues/2897
The order of the 2 conditions is really important, as every MATCHES
operator sets ${CMAKE_MATCH_1}, which is needed inside the condition
block. Ideally, this should be done using a single regex with a
negative forward lookahead, but CMake doesn't seem to support this
2013-04-10 18:15:06 +02:00
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
2013-04-10 12:20:54 +04:00
28b1e81883
renamed device -> cuda
2013-04-08 17:25:15 +04:00
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
14bb4cbe1e
Add cv::String class
2013-03-22 22:14:18 +04:00
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
39ecd94010
forbid recursive globbing for OpenCV modules sources
2013-03-05 11:34:46 +04:00
19f863ec13
add possibility to create CUDA powered modules with ocv_define_module macro
2013-03-02 00:17:46 +04:00
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
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
cf8deac2b2
Always touch variable controlling build of the module
...
This suppresses "unused variable" CMake warning when user explicilty disables
module unavailable in selected configuration
2013-01-10 19:05:39 +04:00
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
8dcf52c90b
Added possibility to make subfolders in modules' folders "src/".
2012-08-28 17:44:33 +04:00
a0aef244d6
removed perf_gpu_cpu from CMake scripts
2012-08-20 09:58:37 +04:00
15e50420bc
Fixed linux and android install
2012-06-27 13:52:29 +00:00
8748cbc232
Fixed optional dependencies tracking in CMake. Fixed TBB compiler definitions for Android.
2012-06-19 20:08:15 +00:00
a20837fb7c
Fixed precompiled headers support detection
2012-06-18 06:53:13 +00:00
79df8db76f
Fixed recently introduced build problems on some platforms
2012-06-08 06:19:17 +00:00
1d57911646
updated gpu-vs-cpu performance tests
2012-05-22 10:29:58 +00:00
4793ca8fbb
fixed precom for opencv_perf_gpu_cpu
2012-05-22 08:54:48 +00:00
8d135e8ea1
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
2012-05-13 09:34:33 +00:00
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
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
e72a23243b
Reworked build scripts for Android Java API, tests and examples
2012-03-27 16:05:52 +00:00
8991d323ea
Refactored Java wrapper build scripts.
...
Improved Android SDK search, fixed some bugs.
2012-03-25 19:57:58 +00:00
ddc4ed4741
Added protection from modules redefinition and globbing recursion
2012-03-15 09:20:16 +00:00
e4307d05f3
Made dependency of features2d and calib3d from highgui optional
2012-03-13 12:33:16 +00:00
628076b7da
Fixed broken headers install layout
2012-03-11 15:22:38 +00:00
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
aa6c677bd8
Added opencv_tests and opencv_perf_tests targets to simplify building tests only
2012-03-02 08:48:33 +00:00
00db5a69a2
More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
2012-02-20 11:50:43 +00:00
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
2012-02-16 20:29:35 +00:00
eac055a27e
Fixed ticket #1580
2012-02-04 18:57:41 +00:00
dfb161e9c9
Fixing #1580
2012-02-03 19:18:35 +00:00
Roman Donchenko