Roman Donchenko [Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)]
Merge pull request #1334 from MarkBelmont:bugfix_1
Roman Donchenko [Fri, 23 Aug 2013 11:56:10 +0000 (15:56 +0400)]
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231
Roman Donchenko [Fri, 23 Aug 2013 11:43:07 +0000 (15:43 +0400)]
Merge pull request #1234 from SpecLad:ios-plist
Roman Donchenko [Fri, 23 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1332 from pengx17:2.4_fix_parallel
Alexander Shishkov [Fri, 23 Aug 2013 08:51:50 +0000 (12:51 +0400)]
Update build_framework.py
MarkBelmont [Fri, 23 Aug 2013 08:39:39 +0000 (16:39 +0800)]
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."
Kirill Kornyakov [Fri, 23 Aug 2013 08:34:35 +0000 (12:34 +0400)]
bugfix-for-3231
Roman Donchenko [Fri, 23 Aug 2013 08:06:56 +0000 (12:06 +0400)]
Merge pull request #1324 from SpecLad:try-compile
Roman Donchenko [Fri, 23 Aug 2013 08:04:32 +0000 (12:04 +0400)]
Merge pull request #1329 from SpecLad:msvc-werror
peng xiao [Fri, 23 Aug 2013 07:35:55 +0000 (15:35 +0800)]
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
Roman Donchenko [Thu, 22 Aug 2013 14:25:38 +0000 (18:25 +0400)]
Added warnings-as-errors support for MSVC.
Roman Donchenko [Thu, 22 Aug 2013 11:46:13 +0000 (15:46 +0400)]
Fix errors in usages of try_compile
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
Roman Donchenko [Thu, 22 Aug 2013 08:46:00 +0000 (12:46 +0400)]
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix
Roman Donchenko [Thu, 22 Aug 2013 07:55:24 +0000 (11:55 +0400)]
Merge pull request #1317 from jet47:gpu-tvl1-optimization
Roman Donchenko [Thu, 22 Aug 2013 07:49:43 +0000 (11:49 +0400)]
Merge pull request #1318 from SpecLad:wow
Alexander Smorkalov [Thu, 22 Aug 2013 06:59:27 +0000 (23:59 -0700)]
WindowsRT mode build warning fix.
Roman Donchenko [Wed, 21 Aug 2013 15:24:25 +0000 (19:24 +0400)]
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
Roman Donchenko [Wed, 21 Aug 2013 14:52:15 +0000 (18:52 +0400)]
Converted tabs to spaces.
Roman Donchenko [Wed, 21 Aug 2013 13:26:54 +0000 (17:26 +0400)]
Normalized file endings.
Roman Donchenko [Wed, 21 Aug 2013 12:44:09 +0000 (16:44 +0400)]
Deleted all trailing whitespace.
Roman Donchenko [Tue, 20 Aug 2013 15:33:23 +0000 (19:33 +0400)]
Disabled whitespace checking for 3rdparty.
Roman Donchenko [Mon, 22 Jul 2013 13:14:08 +0000 (17:14 +0400)]
Added more text/binary/whitespace attributes for files we have.
Roman Donchenko [Wed, 21 Aug 2013 14:34:47 +0000 (18:34 +0400)]
Merge pull request #1305 from SpecLad:perf-precomp
Roman Donchenko [Wed, 21 Aug 2013 14:28:35 +0000 (18:28 +0400)]
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
Alexander Smorkalov [Wed, 21 Aug 2013 10:38:20 +0000 (03:38 -0700)]
C4447 warning about main function format suppressed.
Alexander Smorkalov [Mon, 19 Aug 2013 08:25:53 +0000 (01:25 -0700)]
Invalid usage of cv::Ptr for arrays fixed.
Vladislav Vinogradov [Wed, 21 Aug 2013 14:17:45 +0000 (18:17 +0400)]
minor gpu TVL1 optical flow optimization:
don't calc diff term if it is not used for epsilon criterion
Roman Donchenko [Wed, 21 Aug 2013 12:18:31 +0000 (16:18 +0400)]
Merge pull request #1306 from jet47:gpu-bitwize-fix
Roman Donchenko [Wed, 21 Aug 2013 09:32:27 +0000 (13:32 +0400)]
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
Roman Donchenko [Wed, 21 Aug 2013 09:25:26 +0000 (13:25 +0400)]
Merge pull request #1215 from jet47:cuda-5.5-sanity
kdrobnyh [Wed, 14 Aug 2013 09:33:17 +0000 (13:33 +0400)]
Add IPP 8.0 support in FindIPP script
Roman Donchenko [Wed, 21 Aug 2013 07:56:29 +0000 (11:56 +0400)]
Merge pull request #1314 from jet47:ts-gpu-fix
Vladislav Vinogradov [Wed, 21 Aug 2013 06:12:44 +0000 (10:12 +0400)]
record cuda gpu name to output report
Vladislav Vinogradov [Wed, 21 Aug 2013 06:00:40 +0000 (10:00 +0400)]
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
Vladislav Vinogradov [Tue, 20 Aug 2013 12:28:45 +0000 (16:28 +0400)]
fixed gpu bitwize operation:
incorrect types for template instantiation
Roman Donchenko [Tue, 20 Aug 2013 08:51:33 +0000 (12:51 +0400)]
Fix the name of perf tests' precompiled header.
(cherry picked from commit
aa96d8d053c3d0c367da7c1c1f9c73ed376b3bfa)
Roman Donchenko [Tue, 20 Aug 2013 08:12:22 +0000 (12:12 +0400)]
Merge pull request #1301 from asmorkalov:java_video_capture_fix
Alexander Smorkalov [Mon, 19 Aug 2013 12:27:06 +0000 (16:27 +0400)]
Typo in Java generator fixed.
Typo breaks debug build for Android platform.
Roman Donchenko [Mon, 19 Aug 2013 11:00:36 +0000 (15:00 +0400)]
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
Roman Donchenko [Mon, 19 Aug 2013 10:14:22 +0000 (14:14 +0400)]
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
Roman Donchenko [Mon, 19 Aug 2013 08:04:24 +0000 (12:04 +0400)]
Merge pull request #1288 from nghiaho12:haar
Vladislav Vinogradov [Mon, 19 Aug 2013 07:56:58 +0000 (11:56 +0400)]
fixed gpu cvtColor for BGR <-> YUV
Nghia Ho [Sat, 17 Aug 2013 10:32:13 +0000 (20:32 +1000)]
Buffer is accessed out of bounds.
Roman Donchenko [Fri, 16 Aug 2013 15:59:26 +0000 (19:59 +0400)]
Merge pull request #1286 from SpecLad:optflow-sf-init
Roman Donchenko [Fri, 16 Aug 2013 15:59:12 +0000 (19:59 +0400)]
Merge pull request #1277 from NCBee:2.4
Bahram Dahi [Fri, 16 Aug 2013 15:14:32 +0000 (08:14 -0700)]
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
Roman Donchenko [Fri, 16 Aug 2013 15:03:45 +0000 (19:03 +0400)]
Merge pull request #1280 from asmorkalov:winrt_detect_fix
Alexander Smorkalov [Thu, 15 Aug 2013 13:01:38 +0000 (06:01 -0700)]
WindowsRT availability check reorganized. Build script updated.
Roman Donchenko [Fri, 16 Aug 2013 12:07:41 +0000 (16:07 +0400)]
Merge pull request #1284 from melody-rain:superres_example_2
Roman Donchenko [Fri, 16 Aug 2013 10:43:18 +0000 (14:43 +0400)]
In calcOpticalFlowSF, fixed several uninitialized uses of matrices.
This should fix that pesky test failure that pops up from time to time.
I don't actually know if the default values should be zeros, but the tests
pass, so...
Roman Donchenko [Fri, 16 Aug 2013 10:05:39 +0000 (14:05 +0400)]
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
Roman Donchenko [Fri, 16 Aug 2013 09:58:13 +0000 (13:58 +0400)]
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
Roman Donchenko [Fri, 16 Aug 2013 08:52:47 +0000 (12:52 +0400)]
Merge pull request #1152 from StevenPuttemans:bugfix_2795
Jin Ma [Fri, 16 Aug 2013 08:30:40 +0000 (16:30 +0800)]
1. Added OpenCL version of superres to the sample.
2. Modified according to the feedback of the community.
Roman Donchenko [Fri, 16 Aug 2013 08:22:18 +0000 (12:22 +0400)]
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
Alexander Smorkalov [Thu, 15 Aug 2013 07:01:40 +0000 (00:01 -0700)]
All optimized function tables wrapped to getters to change its
initialization time.
Roman Donchenko [Fri, 16 Aug 2013 08:05:12 +0000 (12:05 +0400)]
Merge pull request #1258 from apavlenko:java_video_capture
Andrey Pavlenko [Thu, 15 Aug 2013 19:49:32 +0000 (23:49 +0400)]
restoring binary compatibility
Roman Donchenko [Thu, 15 Aug 2013 15:12:23 +0000 (19:12 +0400)]
Merge pull request #1275 from rdm12:bug_1922
Alexander Smorkalov [Mon, 12 Aug 2013 13:30:40 +0000 (06:30 -0700)]
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
for libpng added.
Dmitry Retinskiy [Thu, 15 Aug 2013 12:18:01 +0000 (16:18 +0400)]
applied comments after review
Roman Donchenko [Thu, 15 Aug 2013 08:05:01 +0000 (12:05 +0400)]
Merge pull request #1276 from nghiaho12:mushroom
Bahram Dahi [Wed, 14 Aug 2013 22:54:13 +0000 (15:54 -0700)]
Minor bug fix, missing const in method signature
Bahram Dahi [Wed, 14 Aug 2013 22:08:34 +0000 (15:08 -0700)]
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
Roman Donchenko [Wed, 14 Aug 2013 14:50:26 +0000 (18:50 +0400)]
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
Roman Donchenko [Wed, 14 Aug 2013 14:49:38 +0000 (18:49 +0400)]
Merge pull request #1270 from rdm12:bugfix_3094
Dmitry Retinskiy [Wed, 14 Aug 2013 13:08:58 +0000 (17:08 +0400)]
bug #1922: restored most of the class definitions in basic_structures.rst
Nghia Ho [Wed, 14 Aug 2013 13:36:29 +0000 (23:36 +1000)]
Fixed mismatching allocation and deallocation: el_ptr
Roman Donchenko [Wed, 14 Aug 2013 13:27:17 +0000 (17:27 +0400)]
Merge pull request #1254 from pengx17:2.4_filter2d_
kamjagin [Wed, 14 Aug 2013 12:25:46 +0000 (14:25 +0200)]
missed # in if defined
kamjagin [Wed, 14 Aug 2013 11:40:50 +0000 (13:40 +0200)]
added HAVE_QTKIT to tests
kamjagin [Wed, 14 Aug 2013 11:33:47 +0000 (13:33 +0200)]
Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
Dmitry Retinskiy [Wed, 14 Aug 2013 11:30:35 +0000 (15:30 +0400)]
bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty
kdrobnyh [Wed, 14 Aug 2013 09:29:15 +0000 (02:29 -0700)]
Merge pull request #3 from Itseez/2.4
OpenCV changes
Roman Donchenko [Wed, 14 Aug 2013 08:10:21 +0000 (12:10 +0400)]
Merge pull request #1263 from abidrahmank:pyCLAHE_24
Roman Donchenko [Wed, 14 Aug 2013 08:08:58 +0000 (12:08 +0400)]
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
Roman Donchenko [Wed, 14 Aug 2013 08:07:25 +0000 (12:07 +0400)]
Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration
peng xiao [Wed, 14 Aug 2013 02:00:09 +0000 (10:00 +0800)]
Update with apavlenko's suggestions.
abidrahmank [Tue, 13 Aug 2013 14:21:32 +0000 (19:51 +0530)]
CLAHE Python bindings
Roman Donchenko [Tue, 13 Aug 2013 12:34:18 +0000 (16:34 +0400)]
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
Roman Donchenko [Tue, 13 Aug 2013 12:33:54 +0000 (16:33 +0400)]
Merge pull request #1255 from SpecLad:no-cr
StevenPuttemans [Tue, 13 Aug 2013 12:12:57 +0000 (14:12 +0200)]
Missing including of nonfree module to support the use of SURF
detector/descriptor.
Andrey Pavlenko [Tue, 13 Aug 2013 11:51:37 +0000 (15:51 +0400)]
LinkedList -> ArrayList
Roman Donchenko [Tue, 13 Aug 2013 09:37:09 +0000 (13:37 +0400)]
Merge pull request #1256 from kamjagin:2.4
Andrey Pavlenko [Tue, 13 Aug 2013 09:18:01 +0000 (13:18 +0400)]
also fixing JNI library name in JUnit tests
peng xiao [Tue, 13 Aug 2013 09:17:07 +0000 (17:17 +0800)]
Apply bugfix #3121 for OCL.
Miroslav Kobetski [Tue, 13 Aug 2013 08:34:31 +0000 (10:34 +0200)]
Fixed elif/elseif error that made highgui-windows fail on mac+cocoa.
Andrey Pavlenko [Tue, 13 Aug 2013 08:04:36 +0000 (12:04 +0400)]
enabling of VideoCapture(String) [fixing issue #3207]
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
peng xiao [Tue, 13 Aug 2013 05:58:55 +0000 (13:58 +0800)]
Let ocl::filter2D support kernel size >= 3.
Roman Donchenko [Mon, 12 Aug 2013 15:04:18 +0000 (19:04 +0400)]
Don't put \r into OPENCV_REFMAN_TOC.
There's no need, since configure_file writes its output using native
line endings, anyway.
Roman Donchenko [Mon, 12 Aug 2013 14:56:34 +0000 (18:56 +0400)]
Merge pull request #1251 from StevenPuttemans:bugfix_3209
Roman Donchenko [Mon, 12 Aug 2013 13:19:52 +0000 (17:19 +0400)]
Merge pull request #1241 from SpecLad:redundant-precomps
Roman Donchenko [Mon, 12 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1242 from asmorkalov:android_native_cam
Roman Donchenko [Mon, 12 Aug 2013 10:33:29 +0000 (14:33 +0400)]
Merge pull request #1235 from WonderRico:bugfix_dshow
StevenPuttemans [Mon, 12 Aug 2013 09:44:38 +0000 (11:44 +0200)]
Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)
WonderRico [Mon, 12 Aug 2013 09:19:53 +0000 (11:19 +0200)]
fix _index / index
Roman Donchenko [Mon, 12 Aug 2013 08:06:30 +0000 (12:06 +0400)]
Merge pull request #1163 from kdrobnyh:Morphology
Roman Donchenko [Mon, 12 Aug 2013 07:57:39 +0000 (11:57 +0400)]
Merge pull request #1246 from StevenPuttemans:bugfix_3206
StevenPuttemans [Fri, 9 Aug 2013 09:46:46 +0000 (11:46 +0200)]
Added fix mentioned in bug #3206
VideoWriter memory leak solved.
WonderRico [Fri, 9 Aug 2013 14:13:40 +0000 (16:13 +0200)]
fix formating