Andrey Kamaev [Tue, 29 Jan 2013 10:16:07 +0000 (14:16 +0400)]
Merge branch '2.4'
Andrey Kamaev [Mon, 28 Jan 2013 19:57:14 +0000 (23:57 +0400)]
Merge pull request #350 from asmorkalov:android_java_warnings
Andrey Kamaev [Mon, 28 Jan 2013 19:56:55 +0000 (23:56 +0400)]
Merge pull request #349 from Daniil-Osokin:bugfix_opencv_cheatsheet
Andrey Kamaev [Mon, 28 Jan 2013 19:56:41 +0000 (23:56 +0400)]
Merge pull request #348 from Daniil-Osokin:bugfix_YCrCb_formula
Andrey Kamaev [Mon, 28 Jan 2013 19:56:26 +0000 (23:56 +0400)]
Merge pull request #345 from Daniil-Osokin:bugfix_2550
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
Andrey Kamaev [Mon, 28 Jan 2013 16:35:39 +0000 (20:35 +0400)]
Merge pull request #343 from taka-no-me:fix_nlmeans_2646
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.
Daniil Osokin [Mon, 28 Jan 2013 14:41:59 +0000 (18:41 +0400)]
Fixed cheatsheet for loop (bug #2701)
Daniil Osokin [Mon, 28 Jan 2013 14:29:01 +0000 (18:29 +0400)]
Fixed formula of YCrCb to RGB conversion (bug #2725)
Daniil Osokin [Mon, 28 Jan 2013 11:14:32 +0000 (15:14 +0400)]
Removed obsolete steps from Windows installation tutorial (bug #2550)
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)"
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
Andrey Kamaev [Mon, 28 Jan 2013 10:02:05 +0000 (14:02 +0400)]
Add test for issue #2646
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
Andrey Kamaev [Mon, 28 Jan 2013 08:41:35 +0000 (12:41 +0400)]
Merge branch 'fix_jpg2000' into 2.4
Andy Maloney [Sat, 26 Jan 2013 21:38:01 +0000 (16:38 -0500)]
{highgui} Fix copy-paste error in conditional
Andrey Kamaev [Fri, 25 Jan 2013 15:08:53 +0000 (19:08 +0400)]
Merge pull request #338 from taka-no-me:ocl_warnings_master
Andrey Kamaev [Fri, 25 Jan 2013 14:03:19 +0000 (18:03 +0400)]
Fix OpenCL build warnings
Andrey Kamaev [Fri, 25 Jan 2013 13:08:36 +0000 (17:08 +0400)]
Fix build of Java tests
Andrey Kamaev [Fri, 25 Jan 2013 12:30:36 +0000 (16:30 +0400)]
Merge branch '2.4'
Andrey Kamaev [Fri, 25 Jan 2013 12:23:35 +0000 (16:23 +0400)]
Merge pull request #337 from taka-no-me:ocl_appsdk
Andrey Kamaev [Fri, 25 Jan 2013 10:31:34 +0000 (14:31 +0400)]
Fix OpenCL build warnings
Andrey Kamaev [Fri, 25 Jan 2013 10:03:39 +0000 (14:03 +0400)]
Find OpenCL in AMD APP SDK
Andrey Kamaev [Fri, 25 Jan 2013 10:10:06 +0000 (14:10 +0400)]
Merge pull request #336 from ivan-korolev:fix_relative_error_formula
Ivan Korolev [Fri, 25 Jan 2013 07:19:38 +0000 (11:19 +0400)]
Fixed a formula to calculate the relative error
Andrey Kamaev [Thu, 24 Jan 2013 20:53:41 +0000 (00:53 +0400)]
Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
Andrey Kamaev [Thu, 24 Jan 2013 20:46:34 +0000 (00:46 +0400)]
Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
Andrey Kamaev [Thu, 24 Jan 2013 20:46:19 +0000 (00:46 +0400)]
Merge pull request #327 from bitwangyaoyao:2.4_vs2012
Andrey Kamaev [Thu, 24 Jan 2013 20:45:34 +0000 (00:45 +0400)]
Merge pull request #334 from asmaloney:2.4
Andy Maloney [Thu, 24 Jan 2013 15:08:58 +0000 (10:08 -0500)]
Docs: Fix invalid conversion format in example (CV_BGR2GREY -> CV_BGR2GRAY)
Andrey Kamaev [Thu, 24 Jan 2013 14:24:36 +0000 (18:24 +0400)]
Merge pull request #305 from stephenfalken:2.4
Andrey Kamaev [Thu, 24 Jan 2013 13:44:10 +0000 (17:44 +0400)]
Merge pull request #332 from taka-no-me:fix_ocl_warnings
Andrey Kamaev [Thu, 24 Jan 2013 12:15:34 +0000 (16:15 +0400)]
Fix ocl build warnings
Andrey Kamaev [Thu, 24 Jan 2013 11:49:13 +0000 (15:49 +0400)]
Merge pull request #331 from taka-no-me:fix_java_debug
Siegfried Hochdorfer [Thu, 24 Jan 2013 10:40:35 +0000 (11:40 +0100)]
fixed broken indentation
Andrey Kamaev [Thu, 24 Jan 2013 10:26:54 +0000 (14:26 +0400)]
Merge pull request #330 from sromberg:2.4
Andrey Kamaev [Thu, 24 Jan 2013 09:25:12 +0000 (13:25 +0400)]
Fix debug build of Java warppers
Andrey Kamaev [Thu, 24 Jan 2013 09:05:53 +0000 (13:05 +0400)]
Merge pull request #321 from apavlenko:warp_sanity_check
Andrey Kamaev [Thu, 24 Jan 2013 09:03:33 +0000 (13:03 +0400)]
Merge pull request #317 from vpisarev:c2cpp_refactor_imgproc
Stefan Romberg [Thu, 24 Jan 2013 09:01:18 +0000 (10:01 +0100)]
Fixed visualization by choosing the color appropriate to the detection
Fixed visualization by choosing the color appropriate to the detection
score.
Previously the example showed all detections with the same color
disregarding the confidence. This led to the impression that the object
detection did not work at all because there are many detections with low
confidences.
PR to master was
https://github.com/Itseez/opencv/pull/320
yao [Thu, 24 Jan 2013 07:45:29 +0000 (15:45 +0800)]
make ocl module compile on VS2012
yao [Thu, 24 Jan 2013 06:58:41 +0000 (14:58 +0800)]
fix canny crash in bug #2279
yao [Thu, 24 Jan 2013 06:33:28 +0000 (14:33 +0800)]
ocl::cvtColor support YUV and YCbCr formats
Vadim Pisarevsky [Wed, 23 Jan 2013 17:47:58 +0000 (21:47 +0400)]
fixed warnings; restored fixed_size parameter in AutoBuffer
Andrey Kamaev [Wed, 23 Jan 2013 15:02:27 +0000 (19:02 +0400)]
Merge pull request #315 from taka-no-me:java_on
Andrey Pavlenko [Wed, 23 Jan 2013 14:45:06 +0000 (18:45 +0400)]
fixing build warnings
Andrey Kamaev [Mon, 21 Jan 2013 14:32:35 +0000 (18:32 +0400)]
Enable Java bindings on all platforms by default
Andrey Kamaev [Wed, 23 Jan 2013 08:27:30 +0000 (12:27 +0400)]
Quiet output of cv::error in Java tests
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
Andrey Kamaev [Wed, 23 Jan 2013 06:32:32 +0000 (10:32 +0400)]
Java tests: print summary for tests run
Andrey Kamaev [Wed, 23 Jan 2013 06:25:39 +0000 (10:25 +0400)]
Java API: fix build warning on OS X
Common part of all source files is extracted to special header
Andrey Kamaev [Tue, 22 Jan 2013 15:43:54 +0000 (19:43 +0400)]
Add option to run java tests with run.py
Andrey Pavlenko [Wed, 23 Jan 2013 13:25:30 +0000 (17:25 +0400)]
enabling sanity checks for warp and resize functions on Android
- add syntetic images generation function to ts
- use generated syntetic images
Andrey Kamaev [Wed, 23 Jan 2013 10:49:36 +0000 (14:49 +0400)]
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
yao [Thu, 17 Jan 2013 01:34:43 +0000 (09:34 +0800)]
some host side optimizations to ocl::GaussianBlur
yao [Thu, 17 Jan 2013 01:21:39 +0000 (09:21 +0800)]
use format on filtering.cpp
yao [Wed, 16 Jan 2013 09:13:32 +0000 (17:13 +0800)]
make oclHaarDetectObjects running on more ocl platforms
yao [Wed, 16 Jan 2013 08:50:59 +0000 (16:50 +0800)]
A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms
yao [Tue, 15 Jan 2013 09:14:14 +0000 (17:14 +0800)]
add default clAmdFft and clAmdBlas path
yao [Tue, 15 Jan 2013 09:12:46 +0000 (17:12 +0800)]
fix bug #2674
Andrey Kamaev [Wed, 23 Jan 2013 10:40:04 +0000 (14:40 +0400)]
Merge pull request #295 from apavlenko:test_surf_keypoints_invariance
Andrey Kamaev [Wed, 23 Jan 2013 06:36:01 +0000 (10:36 +0400)]
Merge pull request #319 from AnnaKogan8:added-surf-keypoints-cleanup
Anna Kogan [Tue, 22 Jan 2013 14:05:18 +0000 (18:05 +0400)]
Added cleanup of keypoints vector
Andrey Kamaev [Tue, 22 Jan 2013 13:56:04 +0000 (17:56 +0400)]
Hardly refactored CMake script for Java wrappers
Andrey Kamaev [Tue, 22 Jan 2013 09:08:50 +0000 (13:08 +0400)]
Eliminate intermediate build target "opencv_java_api"
Vadim Pisarevsky [Tue, 22 Jan 2013 12:54:31 +0000 (16:54 +0400)]
converted few more comp. geometry functions to C++
Andrey Kamaev [Tue, 22 Jan 2013 12:09:47 +0000 (16:09 +0400)]
Merge pull request #316 from mdim:draw_matches_fix
mdim [Mon, 21 Jan 2013 20:37:27 +0000 (00:37 +0400)]
check of keypoint index range in drawMatches
cuda-geek [Mon, 21 Jan 2013 20:27:01 +0000 (00:27 +0400)]
Merge pull request #311 from cuda-geek:soft-cascade-refactoring-and-fixes
Andrey Kamaev [Mon, 21 Jan 2013 14:10:08 +0000 (18:10 +0400)]
Merge pull request #306 from AnnaKogan8:perf_tests_timing.py-improvement
Andrey Kamaev [Mon, 21 Jan 2013 13:52:35 +0000 (17:52 +0400)]
Merge pull request #314 from vpisarev:2.4
Vadim Pisarevsky [Mon, 21 Jan 2013 11:00:32 +0000 (15:00 +0400)]
changed diagnostic from "warning" to "note" in the python wrapper generator, to suppress some noise in opencv utilities
Andrey Kamaev [Mon, 21 Jan 2013 10:14:16 +0000 (14:14 +0400)]
Merge pull request #303 from taka-no-me:fix_split_merge_test
Vadim Pisarevsky [Sun, 20 Jan 2013 21:07:47 +0000 (01:07 +0400)]
converted fitline to C++, fixed Mat::checkVector().
Vadim Pisarevsky [Sat, 19 Jan 2013 20:58:51 +0000 (00:58 +0400)]
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
Andrey Kamaev [Sat, 19 Jan 2013 08:03:20 +0000 (12:03 +0400)]
Merge pull request #312 from taka-no-me:cheatsheet
Andrey Kamaev [Sat, 19 Jan 2013 08:03:03 +0000 (12:03 +0400)]
Merge pull request #310 from taka-no-me:4digit_version
Andrey Kamaev [Sat, 19 Jan 2013 08:02:49 +0000 (12:02 +0400)]
Merge pull request #309 from asmorkalov:android_manager_4number_version
Andrey Kamaev [Sat, 19 Jan 2013 08:02:32 +0000 (12:02 +0400)]
Merge pull request #307 from taka-no-me:lena.png
Andrey Kamaev [Sat, 19 Jan 2013 08:02:14 +0000 (12:02 +0400)]
Merge pull request #267 from pclove1:ocl_hough
Vadim Pisarevsky [Fri, 18 Jan 2013 20:26:01 +0000 (00:26 +0400)]
convex hull converted to C++; other 2 functions in convhull.cpp are yet to be finished.
Andrey Kamaev [Fri, 18 Jan 2013 14:27:43 +0000 (18:27 +0400)]
Add opencv_cheatsheet.pdf to documentation build and silence Latex output
marina.kolpakova [Fri, 18 Jan 2013 12:38:54 +0000 (16:38 +0400)]
fix test for new cascade
marina.kolpakova [Wed, 16 Jan 2013 10:04:32 +0000 (14:04 +0400)]
fix python wrapping
marina.kolpakova [Mon, 14 Jan 2013 19:33:12 +0000 (23:33 +0400)]
fix typo
marina.kolpakova [Thu, 10 Jan 2013 22:36:45 +0000 (02:36 +0400)]
add two types of feature boxes support:
- (left, top, width, height)
- (left, top, right, bottom)
marina.kolpakova [Mon, 24 Dec 2012 05:36:39 +0000 (09:36 +0400)]
fix soft scade xml
marina.kolpakova [Mon, 24 Dec 2012 04:43:04 +0000 (08:43 +0400)]
fix test for a new test data
marina.kolpakova [Mon, 24 Dec 2012 04:15:12 +0000 (08:15 +0400)]
a bit refactored soft cascade
marina.kolpakova [Wed, 19 Dec 2012 06:21:50 +0000 (10:21 +0400)]
perf test
marina.kolpakova [Wed, 19 Dec 2012 05:46:49 +0000 (09:46 +0400)]
xml for soft cascade
marina.kolpakova [Wed, 19 Dec 2012 05:30:17 +0000 (09:30 +0400)]
integrate 128x256 scale; remove log
marina.kolpakova [Wed, 19 Dec 2012 04:39:06 +0000 (08:39 +0400)]
integrated 128x256 scale
marina.kolpakova [Tue, 18 Dec 2012 19:01:27 +0000 (23:01 +0400)]
first debug integration of newly trained cascade
Andrey Kamaev [Fri, 18 Jan 2013 10:57:55 +0000 (14:57 +0400)]
Consistently use 4-digit library version
Alexander Smorkalov [Wed, 16 Jan 2013 12:47:06 +0000 (16:47 +0400)]
4 digit library version numeration implemented in OpenCV Manager
Code refactoring done.
OpenCV library version type changed to int.
Some UI labels updated.
OpenCV Manager verison incremented.
Andrey Kamaev [Thu, 17 Jan 2013 16:40:41 +0000 (20:40 +0400)]
Convert test image to losless format
This fixes java tests failing with new jpeg versions
Andrey Kamaev [Thu, 17 Jan 2013 14:36:57 +0000 (18:36 +0400)]
Merge branch 2.4
Andrey Kamaev [Thu, 17 Jan 2013 14:20:47 +0000 (18:20 +0400)]
Merge pull request #304 from apavlenko:test_java_fix_double
Siegfried Hochdorfer [Thu, 17 Jan 2013 10:46:24 +0000 (11:46 +0100)]
MeanshiftGrouping Bugfix (Bug #2685)