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
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
berak [Sun, 24 Nov 2013 14:58:13 +0000 (15:58 +0100)]
mouse_and_match.py missing import cv2
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 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
Andrey Pavlenko [Fri, 22 Nov 2013 09:57:22 +0000 (13:57 +0400)]
Merge pull request #1852 from ilya-lavrenov:ocl_retina
Ilya Lavrenov [Fri, 22 Nov 2013 08:35:29 +0000 (12:35 +0400)]
changed eps in Retina_OCL test
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:36 +0000 (17:32 +0400)]
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
Ilya Lavrenov [Thu, 21 Nov 2013 10:21:43 +0000 (14:21 +0400)]
fixed kernel compilation
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 12:08:52 +0000 (16:08 +0400)]
Merge pull request #1828 from SpecLad:merge-2.4
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 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
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 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
Vadim Pisarevsky [Tue, 19 Nov 2013 04:14:44 +0000 (23:14 -0500)]
added some diagnostic into Tonemap test
Vadim Pisarevsky [Tue, 19 Nov 2013 03:15:04 +0000 (22:15 -0500)]
another attempt to fix compile errors
Vadim Pisarevsky [Mon, 18 Nov 2013 19:26:19 +0000 (14:26 -0500)]
fixed some more compile errors
Vadim Pisarevsky [Mon, 18 Nov 2013 18:48:04 +0000 (13:48 -0500)]
fixed few compile errors and doc build errors
Vadim Pisarevsky [Mon, 18 Nov 2013 17:02:10 +0000 (12:02 -0500)]
removed unnecessary opencl kernels
Vadim Pisarevsky [Mon, 18 Nov 2013 16:48:00 +0000 (11:48 -0500)]
updated patch to bring in the first functions with "transparent API"
Roman Donchenko [Mon, 18 Nov 2013 14:09:43 +0000 (18:09 +0400)]
Merge pull request #1811 from Nerei:fixed_some_build_errors
Roman Donchenko [Mon, 18 Nov 2013 11:48:27 +0000 (15:48 +0400)]
Merge pull request #1722 from StevenPuttemans:feature_1631_second
Roman Donchenko [Mon, 18 Nov 2013 11:16:36 +0000 (15:16 +0400)]
Merge pull request #1807 from KonstantinMatskevich:intel_bug
Roman Donchenko [Mon, 18 Nov 2013 10:55:24 +0000 (14:55 +0400)]
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
Konstantin Matskevich [Mon, 18 Nov 2013 08:55:15 +0000 (12:55 +0400)]
fixed Split for device version equals 78712
Konstantin Matskevich [Fri, 15 Nov 2013 13:26:18 +0000 (17:26 +0400)]
fixing bugs for Intel platform CPU device
Roman Donchenko [Mon, 18 Nov 2013 08:20:58 +0000 (12:20 +0400)]
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
StevenPuttemans [Wed, 30 Oct 2013 12:34:27 +0000 (13:34 +0100)]
Applied all fixes related to translating C to C++ code
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
Anatoly Baksheev [Sun, 17 Nov 2013 11:18:39 +0000 (15:18 +0400)]
Viz code beautification
Anatoly Baksheev [Sun, 17 Nov 2013 11:18:15 +0000 (15:18 +0400)]
added viz tutorial 3 test
Anatoly Baksheev [Sun, 17 Nov 2013 10:03:38 +0000 (14:03 +0400)]
fixed compilation for vs2008
Anatoly Baksheev [Sat, 16 Nov 2013 17:27:03 +0000 (21:27 +0400)]
fixed all Viz warnings
moved some headers to precomp.hpp
Anatoly Baksheev [Sat, 16 Nov 2013 17:04:21 +0000 (21:04 +0400)]
fixed warnings
Anatoly Baksheev [Sat, 16 Nov 2013 16:56:42 +0000 (20:56 +0400)]
Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there.
Anatoly Baksheev [Sat, 16 Nov 2013 15:56:08 +0000 (19:56 +0400)]
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
Anatoly Baksheev [Tue, 15 Oct 2013 13:34:20 +0000 (17:34 +0400)]
compilation & warnings
Alexander Alekhin [Fri, 15 Nov 2013 14:49:11 +0000 (18:49 +0400)]
ocl: fix cvtColor XYZ: variables on stack
Ilya Lavrenov [Fri, 15 Nov 2013 09:48:14 +0000 (13:48 +0400)]
generalized ocl::resize for all data types (INTER_NEAREST mode)
Roman Donchenko [Fri, 15 Nov 2013 15:41:53 +0000 (19:41 +0400)]
Switched OpenCV to a 3-component version number.
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
Roman Donchenko [Fri, 15 Nov 2013 12:52:55 +0000 (16:52 +0400)]
Merge pull request #1802 from SpecLad:cmake-templates
Roman Donchenko [Fri, 15 Nov 2013 11:55:29 +0000 (15:55 +0400)]
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Fri, 15 Nov 2013 11:53:05 +0000 (15:53 +0400)]
Merge pull request #1804 from alekcac:youtube_link_fix
Roman Donchenko [Fri, 15 Nov 2013 08:01:16 +0000 (12:01 +0400)]
Merge pull request #1801 from vrabaud:master
Roman Donchenko [Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)]
Merge pull request #1799 from SpecLad:avformat-53-6
Alexander Shishkov [Fri, 15 Nov 2013 01:36:22 +0000 (04:36 +0300)]
Update widget_pose.rst
changed Youtube link to our channel
Roman Donchenko [Thu, 14 Nov 2013 15:14:38 +0000 (19:14 +0400)]
Made the generated file templates' naming more consistent.
The general convention is <output file name> + ".in".
Vincent Rabaud [Thu, 14 Nov 2013 14:24:18 +0000 (15:24 +0100)]
do not use include_directories when calling find_package(OpenCV)
This is something that should be left to the user, that's the whole
point of OpenCV_INCLUDE_DIRS.
Roman Donchenko [Thu, 14 Nov 2013 13:25:46 +0000 (17:25 +0400)]
Fix building with FFmpeg 0.8.
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
Roman Donchenko [Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)]
Merge pull request #1794 from vrabaud:2.4
Roman Donchenko [Thu, 14 Nov 2013 10:46:42 +0000 (14:46 +0400)]
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Thu, 14 Nov 2013 10:46:06 +0000 (14:46 +0400)]
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
Roman Donchenko [Thu, 14 Nov 2013 10:45:50 +0000 (14:45 +0400)]
Merge pull request #1790 from ilya-lavrenov:ocl_ref
Vincent Rabaud [Thu, 14 Nov 2013 10:45:42 +0000 (11:45 +0100)]
cleaner fix
Ilya Lavrenov [Thu, 14 Nov 2013 08:02:32 +0000 (12:02 +0400)]
added RGBA <-> mRGBA
Ilya Lavrenov [Wed, 13 Nov 2013 15:35:24 +0000 (19:35 +0400)]
added HLS -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:08:37 +0000 (19:08 +0400)]
added HSV -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:41:40 +0000 (17:41 +0400)]
added RGB[A] -> HLS[FULL] conversion
Roman Donchenko [Wed, 13 Nov 2013 13:21:52 +0000 (17:21 +0400)]
Merge pull request #1788 from alalek:perf_test_skip
Vincent Rabaud [Wed, 13 Nov 2013 13:20:09 +0000 (14:20 +0100)]
return when OpenCV is found
Ilya Lavrenov [Wed, 13 Nov 2013 13:09:05 +0000 (17:09 +0400)]
added RGB[A] -> HSV[FULL] conversion
Roman Donchenko [Wed, 13 Nov 2013 13:00:20 +0000 (17:00 +0400)]
Merge pull request #1786 from SpecLad:cap-images-file-pattern
Roman Donchenko [Wed, 13 Nov 2013 11:53:42 +0000 (15:53 +0400)]
Merge pull request #1779 from perping:integral_2.4
Roman Donchenko [Wed, 13 Nov 2013 11:52:42 +0000 (15:52 +0400)]
Merge pull request #1784 from SpecLad:ffmpeg-no-png
Vincent Rabaud [Wed, 13 Nov 2013 11:25:44 +0000 (12:25 +0100)]
fixes http://code.opencv.org/issues/3367
Alexander Alekhin [Tue, 12 Nov 2013 14:59:43 +0000 (18:59 +0400)]
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
Alexander Alekhin [Tue, 12 Nov 2013 14:15:50 +0000 (18:15 +0400)]
perf tests: allow to skip performance tests
Ilya Lavrenov [Tue, 12 Nov 2013 12:50:42 +0000 (16:50 +0400)]
refactored some functions from ocl arithm
Ilya Lavrenov [Wed, 13 Nov 2013 09:04:02 +0000 (13:04 +0400)]
added eps to ocl::buildWarpPerspectiveMaps perf test
Roman Donchenko [Wed, 13 Nov 2013 08:20:08 +0000 (12:20 +0400)]
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
Roman Donchenko [Wed, 13 Nov 2013 08:16:01 +0000 (12:16 +0400)]
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
Roman Donchenko [Wed, 13 Nov 2013 08:15:18 +0000 (12:15 +0400)]
Merge pull request #1791 from prattmic:limit
Michael Pratt [Wed, 13 Nov 2013 02:40:39 +0000 (21:40 -0500)]
Add missing limits include
Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:
modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’
perping [Wed, 13 Nov 2013 02:19:09 +0000 (10:19 +0800)]
fix haar
perping [Wed, 13 Nov 2013 02:09:39 +0000 (10:09 +0800)]
fix match_template and haar
Ilya Lavrenov [Tue, 12 Nov 2013 15:14:40 +0000 (19:14 +0400)]
fixed compilation of ocl::minMaxLoc for Intel device
Roman Donchenko [Tue, 12 Nov 2013 12:15:41 +0000 (16:15 +0400)]
In the image sequence capture, only search for the ordinal in the file name.
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
Ilya Lavrenov [Mon, 11 Nov 2013 16:08:40 +0000 (20:08 +0400)]
kernel warnings on AMD
Roman Donchenko [Tue, 12 Nov 2013 10:26:50 +0000 (14:26 +0400)]
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
perping [Tue, 12 Nov 2013 10:13:44 +0000 (18:13 +0800)]
fix linux warning.
perping [Tue, 12 Nov 2013 09:54:03 +0000 (17:54 +0800)]
fix haar