profile/ivi/opencv.git
11 years agoapply patch #2686
marina.kolpakova [Wed, 30 Jan 2013 16:20:06 +0000 (20:20 +0400)]
apply patch #2686

11 years agoMerge pull request #375 from taka-no-me:fix_opticalflow_2075
cuda-geek [Wed, 30 Jan 2013 16:18:53 +0000 (20:18 +0400)]
Merge pull request #375 from taka-no-me:fix_opticalflow_2075

11 years agoMerge pull request #373 from ilysenkov:bugfix_2440
Andrey Kamaev [Wed, 30 Jan 2013 15:37:16 +0000 (19:37 +0400)]
Merge pull request #373 from ilysenkov:bugfix_2440

11 years agoMerge pull request #376 from taka-no-me:solve_tiff_conflict
Andrey Kamaev [Wed, 30 Jan 2013 15:36:09 +0000 (19:36 +0400)]
Merge pull request #376 from taka-no-me:solve_tiff_conflict

11 years agofix broken links in cascade classification documentation
marina.kolpakova [Wed, 30 Jan 2013 15:28:16 +0000 (19:28 +0400)]
fix broken links in cascade classification documentation

11 years agoMerge pull request #378 from ivan-korolev:fix_OpenCVDetectTBB_cmake
Andrey Kamaev [Wed, 30 Jan 2013 15:16:31 +0000 (19:16 +0400)]
Merge pull request #378 from ivan-korolev:fix_OpenCVDetectTBB_cmake

11 years agoMerge pull request #380 from asmorkalov:java_test_fix2
cuda-geek [Wed, 30 Jan 2013 15:03:35 +0000 (19:03 +0400)]
Merge pull request #380 from asmorkalov:java_test_fix2

11 years agoMerge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build
cuda-geek [Wed, 30 Jan 2013 14:59:55 +0000 (18:59 +0400)]
Merge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build

11 years agochanged default parameters of SURF, which improved its performance. Restored bi-linea...
Vadim Pisarevsky [Wed, 30 Jan 2013 14:07:37 +0000 (18:07 +0400)]
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.

11 years agoMerge pull request #379 from taka-no-me:fix_ocl_samples_warnings
Andrey Kamaev [Wed, 30 Jan 2013 14:06:49 +0000 (18:06 +0400)]
Merge pull request #379 from taka-no-me:fix_ocl_samples_warnings

11 years agoTestCheckVector java test fixed. Warning fixed.
Alexander Smorkalov [Wed, 30 Jan 2013 13:28:22 +0000 (17:28 +0400)]
TestCheckVector java test fixed. Warning fixed.

11 years agoFix build warnings in OpenCL samples
Andrey Kamaev [Wed, 30 Jan 2013 13:25:03 +0000 (17:25 +0400)]
Fix build warnings in OpenCL samples

11 years agofix default include dirs for TBB
Ivan Korolev [Wed, 30 Jan 2013 13:17:04 +0000 (17:17 +0400)]
fix default include dirs for TBB

11 years agofix v4l yes-yes build
Ivan Korolev [Wed, 30 Jan 2013 13:04:33 +0000 (17:04 +0400)]
fix v4l yes-yes build

11 years agoSolve conflict between tiff.h and opencv2/core/types_c.h
Andrey Kamaev [Wed, 30 Jan 2013 12:36:50 +0000 (16:36 +0400)]
Solve conflict between tiff.h and opencv2/core/types_c.h

Сonflict exists between some versions of libtiff and opencv headers

11 years agoAllow input of calcOpticalFlowPyrLK be submats of different size images
Andrey Kamaev [Wed, 30 Jan 2013 12:07:55 +0000 (16:07 +0400)]
Allow input of calcOpticalFlowPyrLK be submats of different size images

This fixes bug #2075

11 years agoAdd test for issue #2075
Andrey Kamaev [Wed, 30 Jan 2013 12:07:38 +0000 (16:07 +0400)]
Add test for issue #2075

11 years agoFixed bug in the cv::estimateRigidTransform (#1949)
Ivan Korolev [Wed, 30 Jan 2013 09:10:50 +0000 (13:10 +0400)]
Fixed bug in the cv::estimateRigidTransform (#1949)

11 years agoFixed cvDestroyAllWindows() without windows in QT (#2440)
Ilya Lysenkov [Wed, 30 Jan 2013 11:26:49 +0000 (15:26 +0400)]
Fixed cvDestroyAllWindows() without windows in QT (#2440)

11 years agoTested cvDestroyAllWindows() without windows
Ilya Lysenkov [Wed, 30 Jan 2013 11:25:10 +0000 (15:25 +0400)]
Tested cvDestroyAllWindows() without windows

11 years agoMerge pull request #365 from ivan-korolev:fix_HoughLines_segfault
Andrey Kamaev [Wed, 30 Jan 2013 11:16:30 +0000 (15:16 +0400)]
Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault

11 years agoMerge pull request #371 from taka-no-me:fix_build
Andrey Kamaev [Wed, 30 Jan 2013 11:06:19 +0000 (15:06 +0400)]
Merge pull request #371 from taka-no-me:fix_build

11 years agoMerge pull request #370 from ilysenkov:bugfix_1747
Andrey Kamaev [Wed, 30 Jan 2013 10:42:10 +0000 (14:42 +0400)]
Merge pull request #370 from ilysenkov:bugfix_1747

11 years agoMerge pull request #369 from asmorkalov:corner_detection_tutorial
Andrey Kamaev [Wed, 30 Jan 2013 10:41:56 +0000 (14:41 +0400)]
Merge pull request #369 from asmorkalov:corner_detection_tutorial

11 years agoMerge pull request #368 from ilysenkov:checkSubset-fix
Andrey Kamaev [Wed, 30 Jan 2013 10:41:37 +0000 (14:41 +0400)]
Merge pull request #368 from ilysenkov:checkSubset-fix

11 years agoMerge pull request #366 from asmorkalov:gstreamer_codec_list
Andrey Kamaev [Wed, 30 Jan 2013 10:41:21 +0000 (14:41 +0400)]
Merge pull request #366 from asmorkalov:gstreamer_codec_list

11 years agoMerge pull request #362 from Daniil-Osokin:bugfix_doc_StereoSGBM
Andrey Kamaev [Wed, 30 Jan 2013 10:41:06 +0000 (14:41 +0400)]
Merge pull request #362 from Daniil-Osokin:bugfix_doc_StereoSGBM

11 years agoMerge pull request #361 from taka-no-me:tiff_big_tile
Andrey Kamaev [Wed, 30 Jan 2013 10:40:50 +0000 (14:40 +0400)]
Merge pull request #361 from taka-no-me:tiff_big_tile

11 years agoMerge pull request #358 from taka-no-me:objc_exceptions
Andrey Kamaev [Wed, 30 Jan 2013 10:40:32 +0000 (14:40 +0400)]
Merge pull request #358 from taka-no-me:objc_exceptions

11 years agoFix clang build warning
Andrey Kamaev [Wed, 30 Jan 2013 09:31:00 +0000 (13:31 +0400)]
Fix clang build warning

11 years agoFix Windows build warnings
Andrey Kamaev [Wed, 30 Jan 2013 09:24:49 +0000 (13:24 +0400)]
Fix Windows build warnings

11 years agoAdded support of different resolution in rectify3Collinear
Ilya Lysenkov [Wed, 30 Jan 2013 09:19:12 +0000 (13:19 +0400)]
Added support of different resolution in rectify3Collinear

11 years agoFix Android build warnings
Andrey Kamaev [Wed, 30 Jan 2013 09:11:33 +0000 (13:11 +0400)]
Fix Android build warnings

11 years agoBugfix #2532 patch 4 corner detection sample possible bug solved.
Alexander Smorkalov [Wed, 30 Jan 2013 09:05:57 +0000 (13:05 +0400)]
Bugfix #2532 patch 4 corner detection sample possible bug solved.

Tutorial text was not consistent with tutorial source code in samples directory.
Inline source code was replaced on "includeliteral" directive with link to cpp file.

11 years agoMerge pull request #364 from Daniil-Osokin:bugfix_doc_features2d_tutorial
Andrey Kamaev [Wed, 30 Jan 2013 09:05:47 +0000 (13:05 +0400)]
Merge pull request #364 from Daniil-Osokin:bugfix_doc_features2d_tutorial

11 years agoMerge pull request #356 from Daniil-Osokin:bugfix_imread_tutorial
Andrey Kamaev [Wed, 30 Jan 2013 09:05:31 +0000 (13:05 +0400)]
Merge pull request #356 from Daniil-Osokin:bugfix_imread_tutorial

11 years agoAdded processing of trivial subsets
Ilya Lysenkov [Wed, 30 Jan 2013 09:03:03 +0000 (13:03 +0400)]
Added processing of trivial subsets

11 years agoFix build of OpenCV samples (Linux)
Andrey Kamaev [Wed, 30 Jan 2013 08:48:01 +0000 (12:48 +0400)]
Fix build of OpenCV samples (Linux)

11 years agoPatch #2721 More FourCC for gstreamer applied.
Alexander Smorkalov [Wed, 30 Jan 2013 07:44:14 +0000 (11:44 +0400)]
Patch #2721 More FourCC for gstreamer applied.

11 years agoAdded regression test for HoughLines algorithm
Ivan Korolev [Wed, 30 Jan 2013 07:04:15 +0000 (11:04 +0400)]
Added regression test for HoughLines algorithm

11 years agoAdded nonfree header in "Feature description" tutorial code sample (bug #2527)
Daniil Osokin [Wed, 30 Jan 2013 07:06:48 +0000 (11:06 +0400)]
Added nonfree header in "Feature description" tutorial code sample (bug #2527)

11 years agoFixed proposed values for speckleRange in StereoSGBM docs (bug #1937)
Daniil Osokin [Wed, 30 Jan 2013 04:58:58 +0000 (08:58 +0400)]
Fixed proposed values for speckleRange in StereoSGBM docs (bug #1937)

11 years agoFixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug ...
Daniil Osokin [Tue, 29 Jan 2013 12:27:03 +0000 (16:27 +0400)]
Fixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug #2739)

11 years agoFix rollover when computing buffer size in tiff decoder (bug #2161)
Andrey Kamaev [Tue, 29 Jan 2013 16:29:31 +0000 (20:29 +0400)]
Fix rollover when computing buffer size in tiff decoder (bug #2161)

11 years agoAdded minimal support for tiff encoder parameters and test for issue #2161
Andrey Kamaev [Tue, 29 Jan 2013 16:13:09 +0000 (20:13 +0400)]
Added minimal support for tiff encoder parameters and test for issue #2161

11 years agoMerge pull request #360 from vpisarev:sift_fixes
Andrey Kamaev [Tue, 29 Jan 2013 16:39:13 +0000 (20:39 +0400)]
Merge pull request #360 from vpisarev:sift_fixes

11 years agofixed #2580, #2210. some work on #2025.
Vadim Pisarevsky [Tue, 29 Jan 2013 15:38:56 +0000 (19:38 +0400)]
fixed #2580, #2210. some work on #2025.

modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.

added test that finds a planar object using SIFT.

11 years agoMerge pull request #357 from taka-no-me:build_opencv_apps
Andrey Kamaev [Tue, 29 Jan 2013 15:25:51 +0000 (19:25 +0400)]
Merge pull request #357 from taka-no-me:build_opencv_apps

11 years agoMerge pull request #346 from taka-no-me:decouple_V4L2
Andrey Kamaev [Tue, 29 Jan 2013 15:25:30 +0000 (19:25 +0400)]
Merge pull request #346 from taka-no-me:decouple_V4L2

11 years agoAdd -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657)
Andrey Kamaev [Tue, 29 Jan 2013 13:08:26 +0000 (17:08 +0400)]
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657)

11 years agoAdd option to control build of applications (feature #2568)
Andrey Kamaev [Tue, 29 Jan 2013 12:38:59 +0000 (16:38 +0400)]
Add option to control build of applications (feature #2568)

11 years agoRebase and merge pull request #342 from ilysenkov/bugfix_2470
Andrey Kamaev [Tue, 29 Jan 2013 11:53:42 +0000 (15:53 +0400)]
Rebase and merge pull request #342 from ilysenkov/bugfix_2470

11 years agoFixed #2470
Ilya Lysenkov [Mon, 28 Jan 2013 08:41:09 +0000 (12:41 +0400)]
Fixed #2470

11 years agoAdded a test of CvModelEstimator2::checkSubset(...)
Ilya Lysenkov [Mon, 28 Jan 2013 08:40:54 +0000 (12:40 +0400)]
Added a test of CvModelEstimator2::checkSubset(...)

11 years agoMerge pull request #339 from vpisarev:core_fixes
Andrey Kamaev [Tue, 29 Jan 2013 11:51:22 +0000 (15:51 +0400)]
Merge pull request #339 from vpisarev:core_fixes

11 years agoFix build warning
Andrey Kamaev [Tue, 29 Jan 2013 10:46:13 +0000 (14:46 +0400)]
Fix build warning

11 years agoMerge pull request #355 from asmaloney:copy_paste_cond
Andrey Kamaev [Tue, 29 Jan 2013 10:13:00 +0000 (14:13 +0400)]
Merge pull request #355 from asmaloney:copy_paste_cond

11 years agoMerge pull request #354 from asmaloney:fix_mem_dealloc
Andrey Kamaev [Tue, 29 Jan 2013 10:12:12 +0000 (14:12 +0400)]
Merge pull request #354 from asmaloney:fix_mem_dealloc

11 years agoMerge pull request #347 from asmorkalov:WITH_FFMPEG_logic
Andrey Kamaev [Tue, 29 Jan 2013 10:00:09 +0000 (14:00 +0400)]
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic

11 years agoMerge pull request #351 from vpisarev:python_fixes
Vadim Pisarevsky [Tue, 29 Jan 2013 09:34:50 +0000 (13:34 +0400)]
Merge pull request #351 from vpisarev:python_fixes

11 years agoVideo IO perf tests guarded.
Alexander Smorkalov [Mon, 28 Jan 2013 09:14:47 +0000 (13:14 +0400)]
Video IO perf tests guarded.

11 years agoMerge pull request #353 from asmaloney:arg_checks
cuda-geek [Tue, 29 Jan 2013 07:04:32 +0000 (11:04 +0400)]
Merge pull request #353 from asmaloney:arg_checks

11 years agoMerge pull request #328 from jet47:new-gpu-fixes
cuda-geek [Tue, 29 Jan 2013 07:00:36 +0000 (11:00 +0400)]
Merge pull request #328 from jet47:new-gpu-fixes

11 years ago{calib3d} Fix copy-paste error in conditional
Andy Maloney [Mon, 28 Jan 2013 23:09:10 +0000 (18:09 -0500)]
{calib3d} Fix copy-paste error in conditional

11 years agoFix mem leak and mismatched new/delete
Andy Maloney [Mon, 28 Jan 2013 22:57:19 +0000 (17:57 -0500)]
Fix mem leak and mismatched new/delete

11 years agoCheck pointers before using them in var init
Andy Maloney [Mon, 28 Jan 2013 21:51:28 +0000 (16:51 -0500)]
Check pointers before using them in var init

11 years agoMerge pull request #350 from asmorkalov:android_java_warnings
Andrey Kamaev [Mon, 28 Jan 2013 19:57:14 +0000 (23:57 +0400)]
Merge pull request #350 from asmorkalov:android_java_warnings

11 years agoMerge pull request #349 from Daniil-Osokin:bugfix_opencv_cheatsheet
Andrey Kamaev [Mon, 28 Jan 2013 19:56:55 +0000 (23:56 +0400)]
Merge pull request #349 from Daniil-Osokin:bugfix_opencv_cheatsheet

11 years agoMerge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula
Andrey Kamaev [Mon, 28 Jan 2013 19:56:41 +0000 (23:56 +0400)]
Merge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula

11 years agoMerge pull request #345 from Daniil-Osokin:bugfix_2550
Andrey Kamaev [Mon, 28 Jan 2013 19:56:26 +0000 (23:56 +0400)]
Merge pull request #345 from Daniil-Osokin:bugfix_2550

11 years agoMerge pull request #344 from taka-no-me:improve_jpeg_encoder_errors
Andrey Kamaev [Mon, 28 Jan 2013 19:56:01 +0000 (23:56 +0400)]
Merge pull request #344 from taka-no-me:improve_jpeg_encoder_errors

11 years agohopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193). added...
Vadim Pisarevsky [Mon, 28 Jan 2013 17:03:59 +0000 (21:03 +0400)]
hopefully fixed handling of 'long' Python type in OpenCV bindings (bug #2193). added the corresponding test

11 years agoExtended python bindings to support scalar values and tuples in place of InputArray...
Vadim Pisarevsky [Mon, 28 Jan 2013 16:45:00 +0000 (20:45 +0400)]
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658. Added tests for #2611, #2505, #2658

11 years agoExtended python bindings to support scalar values and tuples in place of InputArray...
Vadim Pisarevsky [Mon, 28 Jan 2013 16:44:47 +0000 (20:44 +0400)]
Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket #2658. Added tests for #2611, #2505, #2658

11 years agoMerge pull request #343 from taka-no-me:fix_nlmeans_2646
Andrey Kamaev [Mon, 28 Jan 2013 16:35:39 +0000 (20:35 +0400)]
Merge pull request #343 from taka-no-me:fix_nlmeans_2646

11 years agoResolve warning in OpenCV Library project in Eclipse (Bug #2714)
Alexander Smorkalov [Mon, 28 Jan 2013 15:44:58 +0000 (19:44 +0400)]
Resolve warning in OpenCV Library project in Eclipse (Bug #2714)

Warning in auto generated code was suppressed by project settings.

11 years agoFixed cheatsheet for loop (bug #2701)
Daniil Osokin [Mon, 28 Jan 2013 14:41:59 +0000 (18:41 +0400)]
Fixed cheatsheet for loop (bug #2701)

11 years agoapplied patch #2611 that also likely fixes #2505
Vadim Pisarevsky [Mon, 28 Jan 2013 14:30:20 +0000 (18:30 +0400)]
applied patch #2611 that also likely fixes #2505

11 years agoFixed formula of YCrCb to RGB conversion (bug #2725)
Daniil Osokin [Mon, 28 Jan 2013 14:29:01 +0000 (18:29 +0400)]
Fixed formula of YCrCb to RGB conversion (bug #2725)

11 years agoDon't check for EINTR and replace xioctl with ioctl
Andrey Kamaev [Mon, 28 Jan 2013 13:58:57 +0000 (17:58 +0400)]
Don't check for EINTR and replace xioctl with ioctl

This should be safe todo unless we are writing a signal handler.

11 years agoRemoved obsolete steps from Windows installation tutorial (bug #2550)
Daniil Osokin [Mon, 28 Jan 2013 11:14:32 +0000 (15:14 +0400)]
Removed obsolete steps from Windows installation tutorial (bug #2550)

11 years agoadded tests for #1373, #2629, #2719; fixed another bug in determinant(Matx<T,n,n>)
Vadim Pisarevsky [Mon, 28 Jan 2013 13:27:08 +0000 (17:27 +0400)]
added tests for #1373, #2629, #2719; fixed another bug in determinant(Matx<T,n,n>)

11 years agoNetBSD video(4) support, patch 3 of 3
Patrick Welche [Mon, 17 Sep 2012 12:46:54 +0000 (14:46 +0200)]
NetBSD video(4) support, patch 3 of 3

xioctl() assumes that ioctl takes int request. Cope with
  int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".

11 years agoNetBSD video(4) support, patch 2 of 3
Patrick Welche [Mon, 17 Sep 2012 10:03:35 +0000 (12:03 +0200)]
NetBSD video(4) support, patch 2 of 3

* Decouple Video4Linux2 support from Video4Linux as existence of
  v4l2 on a system does not imply support for v4l.
* Don't use V4L's struct video_window in V4L2 code.
* Removed __USE_GNU as comment says:
      /* support for MJPEG is only available with libjpeg and gcc,
         because it's use libjepg and fmemopen()
  so replace with test for fmemopen() if found necessary.

11 years agoNetBSD video(4) support, patch 1 of 3
Patrick Welche [Mon, 17 Sep 2012 09:08:37 +0000 (11:08 +0200)]
NetBSD video(4) support, patch 1 of 3

The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).

11 years agoImprove error reporting of JPEG image encoder
Andrey Kamaev [Mon, 28 Jan 2013 11:49:31 +0000 (15:49 +0400)]
Improve error reporting of JPEG image encoder

OpenCV issue #2604

After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"

11 years agoFix integer overflow in NL-Means denoising on white input
Andrey Kamaev [Mon, 28 Jan 2013 10:30:06 +0000 (14:30 +0400)]
Fix integer overflow in NL-Means denoising on white input

Issues #2646

11 years agoAdd test for issue #2646
Andrey Kamaev [Mon, 28 Jan 2013 10:02:05 +0000 (14:02 +0400)]
Add test for issue #2646

11 years agoChange Imgproc_ prefix to Photo_ in all accuracy tests of photo module
Andrey Kamaev [Mon, 28 Jan 2013 10:01:22 +0000 (14:01 +0400)]
Change Imgproc_ prefix to Photo_ in all accuracy tests of photo module

11 years agoMerge branch 'fix_jpg2000' into 2.4
Andrey Kamaev [Mon, 28 Jan 2013 08:41:35 +0000 (12:41 +0400)]
Merge branch 'fix_jpg2000' into 2.4

11 years ago{highgui} Fix copy-paste error in conditional
Andy Maloney [Sat, 26 Jan 2013 21:38:01 +0000 (16:38 -0500)]
{highgui} Fix copy-paste error in conditional

11 years agofixed bugs #1373, #2629, #2719
Vadim Pisarevsky [Fri, 25 Jan 2013 19:45:41 +0000 (23:45 +0400)]
fixed bugs #1373, #2629, #2719

11 years agoMerge pull request #337 from taka-no-me:ocl_appsdk
Andrey Kamaev [Fri, 25 Jan 2013 12:23:35 +0000 (16:23 +0400)]
Merge pull request #337 from taka-no-me:ocl_appsdk

11 years agoFix OpenCL build warnings
Andrey Kamaev [Fri, 25 Jan 2013 10:31:34 +0000 (14:31 +0400)]
Fix OpenCL build warnings

11 years agoFind OpenCL in AMD APP SDK
Andrey Kamaev [Fri, 25 Jan 2013 10:03:39 +0000 (14:03 +0400)]
Find OpenCL in AMD APP SDK

11 years agoMerge pull request #336 from ivan-korolev:fix_relative_error_formula
Andrey Kamaev [Fri, 25 Jan 2013 10:10:06 +0000 (14:10 +0400)]
Merge pull request #336 from ivan-korolev:fix_relative_error_formula

11 years agoFixed a formula to calculate the relative error
Ivan Korolev [Fri, 25 Jan 2013 07:19:38 +0000 (11:19 +0400)]
Fixed a formula to calculate the relative error

11 years agoMerge pull request #324 from bitwangyaoyao:2.4_cvtcolor
Andrey Kamaev [Thu, 24 Jan 2013 20:53:41 +0000 (00:53 +0400)]
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor

11 years agoMerge pull request #325 from bitwangyaoyao:2.4_fixcanny
Andrey Kamaev [Thu, 24 Jan 2013 20:46:34 +0000 (00:46 +0400)]
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny

11 years agoMerge pull request #327 from bitwangyaoyao:2.4_vs2012
Andrey Kamaev [Thu, 24 Jan 2013 20:46:19 +0000 (00:46 +0400)]
Merge pull request #327 from bitwangyaoyao:2.4_vs2012