Séverin Lemaignan [Tue, 26 Nov 2013 04:53:44 +0000 (05:53 +0100)]
Ensure compilation to Javascript with Emscripten
Roman Donchenko [Mon, 2 Dec 2013 08:28:18 +0000 (12:28 +0400)]
Merge pull request #1886 from ilya-lavrenov:tapi_lut
Andrey Pavlenko [Fri, 29 Nov 2013 15:21:38 +0000 (19:21 +0400)]
Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master
Ilya Lavrenov [Wed, 27 Nov 2013 14:30:07 +0000 (18:30 +0400)]
added cv::resize INTER_AREA to T-API
Andrey Pavlenko [Fri, 29 Nov 2013 08:59:08 +0000 (12:59 +0400)]
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
Roman Donchenko [Thu, 28 Nov 2013 12:42:53 +0000 (16:42 +0400)]
Merge pull request #1874 from SpecLad:merge-2.4
Ilya Lavrenov [Wed, 27 Nov 2013 20:57:36 +0000 (00:57 +0400)]
added cv::LUT to T-API
Ilya Lavrenov [Wed, 27 Nov 2013 19:42:49 +0000 (23:42 +0400)]
restored ocl_cvtcolor.cl
Ilya Lavrenov [Wed, 27 Nov 2013 19:42:10 +0000 (23:42 +0400)]
RGBA <-> mRGBA
Ilya Lavrenov [Wed, 27 Nov 2013 19:37:58 +0000 (23:37 +0400)]
RGB[A] <-> HLS
Ilya Lavrenov [Wed, 27 Nov 2013 19:30:29 +0000 (23:30 +0400)]
RGB[A] <-> HSV
Ilya Lavrenov [Wed, 27 Nov 2013 18:19:44 +0000 (22:19 +0400)]
BGR5x5 <-> Gray
Ilya Lavrenov [Wed, 27 Nov 2013 16:00:35 +0000 (20:00 +0400)]
RGB[A] <- RGB5x5
Ilya Lavrenov [Wed, 27 Nov 2013 15:52:42 +0000 (19:52 +0400)]
RGB[A] -> RGB5x5
Ilya Lavrenov [Wed, 27 Nov 2013 15:44:37 +0000 (19:44 +0400)]
RGB[A] <-> BGR[A]
Ilya Lavrenov [Wed, 27 Nov 2013 15:37:27 +0000 (19:37 +0400)]
RGB[A] <-> XYZ
Ilya Lavrenov [Wed, 27 Nov 2013 15:25:26 +0000 (19:25 +0400)]
RGB[A] <-> XYZ
Ilya Lavrenov [Wed, 27 Nov 2013 15:24:27 +0000 (19:24 +0400)]
YCrCb -> RGB[A]
Andrey Pavlenko [Wed, 27 Nov 2013 14:08:11 +0000 (18:08 +0400)]
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
Roman Donchenko [Wed, 27 Nov 2013 13:58:53 +0000 (17:58 +0400)]
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
Ilya Lavrenov [Mon, 25 Nov 2013 15:15:36 +0000 (19:15 +0400)]
fixed cv::cvtColor
Roman Donchenko [Wed, 27 Nov 2013 08:59:19 +0000 (12:59 +0400)]
Fixed build errors.
Ilya Lavrenov [Fri, 22 Nov 2013 14:56:03 +0000 (18:56 +0400)]
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
Andrey Pavlenko [Tue, 26 Nov 2013 19:27:48 +0000 (23:27 +0400)]
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
Andrey Pavlenko [Tue, 26 Nov 2013 19:24:50 +0000 (23:24 +0400)]
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
Roman Donchenko [Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)]
Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
modules/ocl/src/arithm.cpp
Roman Donchenko [Tue, 26 Nov 2013 11:05:26 +0000 (15:05 +0400)]
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
Roman Donchenko [Tue, 26 Nov 2013 09:53:47 +0000 (13:53 +0400)]
Merge pull request #1863 from nevion:master
Roman Donchenko [Tue, 26 Nov 2013 09:00:55 +0000 (13:00 +0400)]
Merge pull request #1818 from GregoryMorse:patch-2
Roman Donchenko [Tue, 26 Nov 2013 07:43:34 +0000 (11:43 +0400)]
Merge pull request #1835 from SpecLad:windows-xadd
Roman Donchenko [Tue, 26 Nov 2013 07:40:37 +0000 (11:40 +0400)]
Merge pull request #1859 from SpecLad:string-plus-equals
GregoryMorse [Mon, 18 Nov 2013 12:25:50 +0000 (20:25 +0800)]
Update system.cpp
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Ilya Lavrenov [Mon, 25 Nov 2013 14:14:24 +0000 (18:14 +0400)]
cp test_colot.cpp to imgproc ocl tests
Konstantin Matskevich [Mon, 25 Nov 2013 13:16:22 +0000 (17:16 +0400)]
bugfix in deallocate
Ilya Lavrenov [Thu, 21 Nov 2013 19:25:17 +0000 (23:25 +0400)]
fixed ocl_arithm_op; fix for 3-channel images is needed
Roman Donchenko [Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)]
Merge pull request #1842 from StevenPuttemans:bugfix_3315
Roman Donchenko [Mon, 25 Nov 2013 08:19:58 +0000 (12:19 +0400)]
Merge pull request #1822 from SpecLad:msvc12
Roman Donchenko [Mon, 25 Nov 2013 08:19:20 +0000 (12:19 +0400)]
Merge pull request #1837 from asmorkalov:android_opencl
Roman Donchenko [Mon, 25 Nov 2013 08:17:07 +0000 (12:17 +0400)]
Merge pull request #1839 from pmiecielica:memory_leaks
Roman Donchenko [Mon, 25 Nov 2013 08:15:52 +0000 (12:15 +0400)]
Merge pull request #1864 from berak:mouse_and_match
Roman Donchenko [Mon, 25 Nov 2013 08:04:16 +0000 (12:04 +0400)]
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
Roman Donchenko [Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)]
Merge pull request #1860 from alalek:ocl_fix_undef_warn
berak [Sun, 24 Nov 2013 14:58:13 +0000 (15:58 +0100)]
mouse_and_match.py missing import cv2
Jason Newton [Sun, 24 Nov 2013 09:20:07 +0000 (01:20 -0800)]
correct upper bound for maximum number of labels for 8-way connectivity
Andrey Pavlenko [Sat, 23 Nov 2013 14:54:52 +0000 (18:54 +0400)]
Merge pull request #1862 from alalek:ocl_disable_tests
Alexander Alekhin [Sat, 23 Nov 2013 14:13:32 +0000 (18:13 +0400)]
ocl: disable tests
Andrey Pavlenko [Sat, 23 Nov 2013 12:44:58 +0000 (16:44 +0400)]
Merge pull request #1857 from alalek:ocl_ta_tests_infra
Andrey Pavlenko [Sat, 23 Nov 2013 12:44:37 +0000 (16:44 +0400)]
Merge pull request #1861 from ilya-lavrenov:ocl_args_fix
Ilya Lavrenov [Fri, 22 Nov 2013 14:56:03 +0000 (18:56 +0400)]
fixed error in setting kernel arguments
Alexander Alekhin [Fri, 22 Nov 2013 12:51:01 +0000 (16:51 +0400)]
ocl/core: added prototype for tests
Roman Donchenko [Fri, 22 Nov 2013 14:26:16 +0000 (18:26 +0400)]
Merge pull request #1853 from StevenPuttemans:bugfix_3346
Alexander Alekhin [Fri, 22 Nov 2013 14:24:50 +0000 (18:24 +0400)]
ocl: don't disable Undef warnings
Alexander Alekhin [Thu, 21 Nov 2013 08:35:37 +0000 (12:35 +0400)]
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
Roman Donchenko [Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)]
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5
Roman Donchenko [Fri, 22 Nov 2013 12:55:30 +0000 (16:55 +0400)]
Replaced most of the instances of "s = s +" with "s +=".
This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.
Roman Donchenko [Thu, 21 Nov 2013 14:26:38 +0000 (18:26 +0400)]
Gave cv::String appropriate += operators.
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
Ilya Lavrenov [Fri, 22 Nov 2013 09:00:37 +0000 (13:00 +0400)]
recursive mutex for linux
Piotr Miecielica [Fri, 22 Nov 2013 12:33:33 +0000 (13:33 +0100)]
Added pointer initialization
Alexander Smorkalov [Thu, 19 Sep 2013 07:49:49 +0000 (11:49 +0400)]
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.
Alexander Smorkalov [Fri, 22 Nov 2013 09:59:36 +0000 (13:59 +0400)]
VFPv4 detection implemented. Some Tegra5 related updates.
Andrey Pavlenko [Fri, 22 Nov 2013 09:57:22 +0000 (13:57 +0400)]
Merge pull request #1852 from ilya-lavrenov:ocl_retina
StevenPuttemans [Thu, 21 Nov 2013 12:32:21 +0000 (13:32 +0100)]
Wrong example at the visual studio tutorial. Fixed link, fixed sample
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
StevenPuttemans [Fri, 22 Nov 2013 08:57:47 +0000 (09:57 +0100)]
Fixed bug in report #3346
Ilya Lavrenov [Fri, 22 Nov 2013 08:35:29 +0000 (12:35 +0400)]
changed eps in Retina_OCL test
Alexander Smorkalov [Fri, 22 Nov 2013 07:12:51 +0000 (11:12 +0400)]
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
Piotr Miecielica [Tue, 19 Nov 2013 16:35:27 +0000 (17:35 +0100)]
Fixes of some memory leaks
Andrey Pavlenko [Thu, 21 Nov 2013 17:29:26 +0000 (21:29 +0400)]
Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
Andrey Pavlenko [Thu, 21 Nov 2013 17:29:09 +0000 (21:29 +0400)]
Merge pull request #1848 from ilya-lavrenov:warn
Ilya Lavrenov [Thu, 21 Nov 2013 14:27:07 +0000 (18:27 +0400)]
eliminated warning C4267
Ilya Lavrenov [Thu, 21 Nov 2013 14:23:57 +0000 (18:23 +0400)]
fixed kernel compilation in imgproc module
Andrey Pavlenko [Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)]
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
Andrey Pavlenko [Thu, 21 Nov 2013 13:32:36 +0000 (17:32 +0400)]
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
Roman Donchenko [Thu, 21 Nov 2013 13:11:29 +0000 (17:11 +0400)]
Merge pull request #1838 from alekcac:ios64_fix
Ilya Lavrenov [Thu, 21 Nov 2013 10:21:43 +0000 (14:21 +0400)]
fixed kernel compilation
Ilya Lavrenov [Thu, 21 Nov 2013 08:53:21 +0000 (12:53 +0400)]
added extra parameters to ocl::cvtColor performance test
Roman Donchenko [Thu, 21 Nov 2013 08:31:36 +0000 (12:31 +0400)]
Merge pull request #1795 from alalek:perf_report_progress
Roman Donchenko [Thu, 21 Nov 2013 08:03:01 +0000 (12:03 +0400)]
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
Roman Donchenko [Thu, 21 Nov 2013 07:55:20 +0000 (11:55 +0400)]
Merge pull request #1834 from SpecLad:svm-copy-ctor
Alexander Alekhin [Wed, 20 Nov 2013 15:57:20 +0000 (19:57 +0400)]
perf report: summary.py: added --progress mode
Andrey Pavlenko [Wed, 20 Nov 2013 15:14:39 +0000 (19:14 +0400)]
Merge pull request #1824 from vpisarev:ocl_experiments5
Roman Donchenko [Wed, 20 Nov 2013 14:19:07 +0000 (18:19 +0400)]
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
Alexander Shishkov [Wed, 20 Nov 2013 14:08:05 +0000 (18:08 +0400)]
fix for supporting 64-bit architecture
Roman Donchenko [Wed, 20 Nov 2013 13:59:35 +0000 (17:59 +0400)]
Merge pull request #1833 from SpecLad:fix-qt-sample
Roman Donchenko [Wed, 20 Nov 2013 12:08:52 +0000 (16:08 +0400)]
Merge pull request #1828 from SpecLad:merge-2.4
Roman Donchenko [Wed, 20 Nov 2013 11:57:14 +0000 (15:57 +0400)]
Merge pull request #1829 from SpecLad:config-components-libs
Ilya Lavrenov [Wed, 20 Nov 2013 11:40:56 +0000 (15:40 +0400)]
workaround for AMD bug: UNREACHABLE EXECUTED
Roman Donchenko [Wed, 20 Nov 2013 10:59:42 +0000 (14:59 +0400)]
Gave CvSVM a private copy constructor & assignment operator.
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358>.
Roman Donchenko [Wed, 20 Nov 2013 10:57:21 +0000 (14:57 +0400)]
Fix the Qt sample, broken after #1722.
Roman Donchenko [Wed, 20 Nov 2013 09:47:35 +0000 (13:47 +0400)]
Simplified the Windows implementation of CV_XADD.
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365>.
Roman Donchenko [Wed, 20 Nov 2013 09:36:37 +0000 (13:36 +0400)]
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
Roman Donchenko [Wed, 20 Nov 2013 07:52:53 +0000 (11:52 +0400)]
Merge pull request #1816 from SpecLad:no-more-epoch
Roman Donchenko [Wed, 20 Nov 2013 07:52:30 +0000 (11:52 +0400)]
Merge pull request #1830 from SpecLad:config-includes
Vadim Pisarevsky [Wed, 20 Nov 2013 01:51:31 +0000 (20:51 -0500)]
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
Vadim Pisarevsky [Wed, 20 Nov 2013 00:20:24 +0000 (19:20 -0500)]
fixed failure in Tonemap test
Philippe FOUBERT [Tue, 19 Nov 2013 20:51:47 +0000 (21:51 +0100)]
Back to the previous coding way (using the macro with the goto).
Roman Donchenko [Tue, 19 Nov 2013 15:00:56 +0000 (19:00 +0400)]
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
After #1801, the include directories are no longer added automatically,
so we should show the user how to do that.
Roman Donchenko [Tue, 19 Nov 2013 14:58:33 +0000 (18:58 +0400)]
In OpenCVConfig.cmake.in, lowercased the commands in the example.
This is the preferred style nowadays, and more consistent with the
rest of the code.
Roman Donchenko [Tue, 19 Nov 2013 14:36:58 +0000 (18:36 +0400)]
Fixed OpenCV_LIBS when find_package has been used with explicit components.
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.
Roman Donchenko [Tue, 19 Nov 2013 12:25:46 +0000 (16:25 +0400)]
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
Roman Donchenko [Tue, 19 Nov 2013 12:21:09 +0000 (16:21 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp