Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Alexander Smorkalov
070a77ae0d
TBB updated to version 4.1 update 4.
2013-06-27 15:47:23 +04:00
Alexander Smorkalov
08a0e1c91b
TBB support for WinRT fixed.
...
Development release of TBB with WinRT support added;
TBB.dll is placed in bin folder now.
2013-06-25 03:35:54 -07:00
Alexander Smorkalov
e3577c2f58
Build with dev release of TBB enabled.
2013-06-24 02:45:21 -07: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
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Alexander Smorkalov
8606ee4beb
Front/Back camera semantic support added to Android VideoCapture back-end.
2013-04-24 10:56:16 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
AoD314
740941c8b8
update libwebp up to 0.3.0
2013-04-02 15:22:10 +04:00
Andrey Kamaev
ec15d6f383
Merge pull request #690 from berak:master
2013-03-22 19:35:17 +04:00
berak
d32af86e75
Update CMakeLists.txt
...
exclude IlmImf/b44ExpLogTable.cpp from the build,
it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation
when included with static linking it introduces a problem with multiple definitions of main()
2013-03-22 09:31:40 +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
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
AoD314
fd44322b4f
added CMakeLists.txt for build WebP
2013-03-07 19:31:02 +04:00
AoD314
e7cb317c7d
added cpu-features for WebP
2013-03-07 19:07:43 +04:00
AoD314
500b7318be
added WebP library
2013-03-07 19:07:31 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
OpenCV Buildbot
e6dd4e840d
Update FFMPEG wrapper binaries
2013-02-22 16:56:01 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
OpenCV Buildbot
50d3e565c5
Update FFMPEG wrapper binaries
2013-02-14 18:39:24 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Andrey Kamaev
4045e6e588
Update tbb to version 4.1 update 2
2013-02-08 18:45:24 +04:00
Alexander Smorkalov
192ee15520
Code review notes fixed;
...
HardFP and SoftFP toolchains joined to one;
RPATH skiping added.
2013-02-08 12:42:03 +04:00
Alexander Smorkalov
b81f0887f0
Carma board support fixed.
2013-02-06 14:47:42 +04:00
Alexander Smorkalov
4e243e1759
TBB build for arm linux fixed. Processors count detected correctly.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
3ed99b7700
Code review notes applied.
...
Toolchain for arm hardfp added.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
ffb9da14fb
TBB build defines for Linux added.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
7882aba7af
TBB download and build option enabled for non Android platfroms.
2013-02-06 14:43:57 +04:00
Andrey Kamaev
9e3570260b
Update libjpeg to "Version 9 13-Jan-2013"
2013-01-14 11:07:49 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Andrey Kamaev
24af691843
Merge pull request #168 from asmorkalov:android_42_camera_fix
2012-11-21 14:50:53 +04:00
Alexander Smorkalov
aa4e6a8a83
Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
...
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
2012-11-21 11:37:29 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Andrey Kamaev
9ca1162be8
Update URL for TBB download. Update to TBB 4.1 update 1
2012-11-19 11:43:28 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
ac96bb357c
Suppress more warnings in libtiff
2012-10-23 18:20:07 +04:00
OpenCV Buildbot
1cb21d292b
update FFMPEG wrapper binaries
2012-10-23 13:17:43 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +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
2885eb86b8
Remove alignment reqirements from NEON optimizations in libpng
...
On Android memory is not guaranted to be aligned and applications often crash with BUSERROR
2012-10-05 18:15:44 +04:00
Alexander Smorkalov
d64d76086e
MIPS architecture support added. Native camera library built for MIPS device.
2012-10-02 16:21:53 +04:00
Andrey Pavlenko
56200dbd37
REVERT OF: Update libjpeg to release 8d (reverse-merged from commit d28af08ef3)
2012-09-26 14:02:23 +04:00
Andrey Pavlenko
4e193a3380
REVERT OF reverted libjpeg to an earlier version (reverse-merged from commit bfc8a52402)
2012-09-26 14:01:51 +04:00
Vadim Pisarevsky
bfc8a52402
reverted libjpeg to an earlier version
2012-09-24 15:11:29 +04:00
