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 |
|
Roman Donchenko
|
d9f71b762f
|
Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
|
2013-08-08 12:43:07 +04:00 |
|
Roman Donchenko
|
ac39bfb4cc
|
Remove HAVE_CVCONFIG_H - it's always defined.
|
2013-07-10 16:02:07 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
f77a375354
|
Merge branch '2.4'
|
2013-03-29 19:38:35 +04:00 |
|
Anatoly Baksheev
|
7fa01e3fcc
|
enabled png and jpeg for iOS
|
2013-03-25 11:19:29 +04:00 |
|
Andrey Kamaev
|
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 |
|
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
|
c5df95d5a9
|
Shortened cmake script for opencv_world
|
2012-06-15 07:52:20 +00:00 |
|
Vadim Pisarevsky
|
76f49f3078
|
added script to build the universal opencv2.framework for iOS device and simulator. fixed opencv_world cmake script to create static libopencv_world.a for iOS. temporarily disable compressed file storages in the case of iOS (to avoid dependency of zlib)
|
2012-06-09 16:18:39 +00:00 |
|
Andrey Kamaev
|
5a41c6509e
|
Fixed build of opencv_world with QT on linux #2012
|
2012-06-06 13:24:41 +00:00 |
|
Andrey Kamaev
|
37d9c3f835
|
Fixed some corner cases of opencv_world configuration
|
2012-05-21 20:15:17 +00:00 |
|
Vadim Pisarevsky
|
fd68cc768a
|
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)
|
2012-05-21 14:56:07 +00:00 |
|
Andrey Kamaev
|
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 |
|
Vadim Pisarevsky
|
6dde56faf4
|
fixed building opencv_world with VS2010
|
2012-05-12 16:27:40 +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 |
|