Daniil Osokin [Mon, 28 Jan 2013 14:29:01 +0000 (18:29 +0400)]
Fixed formula of YCrCb to RGB conversion (bug #2725)
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 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
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
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"
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
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 [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 [Fri, 18 Jan 2013 14:27:43 +0000 (18:27 +0400)]
Add opencv_cheatsheet.pdf to documentation build and silence Latex output
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 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)
Andrey Pavlenko [Wed, 16 Jan 2013 14:33:35 +0000 (18:33 +0400)]
fixing test failure on some systems
Andrey Kamaev [Wed, 16 Jan 2013 12:44:12 +0000 (16:44 +0400)]
Merge pull request #296 from asmorkalov:html_docs_warning_fix
Andrey Kamaev [Wed, 16 Jan 2013 12:30:37 +0000 (16:30 +0400)]
Merge pull request #297 from taka-no-me:fix_deps
Andrey Kamaev [Wed, 16 Jan 2013 12:07:49 +0000 (16:07 +0400)]
Merge pull request #302 from taka-no-me:fix_doc_sphinx107
Andrey Kamaev [Wed, 16 Jan 2013 10:49:46 +0000 (14:49 +0400)]
Merge pull request #300 from taka-no-me:java_64bit
Andrey Kamaev [Wed, 16 Jan 2013 08:43:12 +0000 (12:43 +0400)]
Fix documentation build with Sphinx 1.07
Andrey Kamaev [Tue, 15 Jan 2013 15:23:49 +0000 (19:23 +0400)]
Fix incorrect Mat address reconstruction on 64-bit platforms
This fixes random failures in Java wrappers.
Anna Kogan [Tue, 15 Jan 2013 11:32:22 +0000 (15:32 +0400)]
Switched time from seconds to minutes
Anna Kogan [Tue, 15 Jan 2013 11:26:43 +0000 (15:26 +0400)]
Added 'Num of tests' col, changed headers, added 'overall time' row
Andrey Kamaev [Mon, 14 Jan 2013 14:16:04 +0000 (18:16 +0400)]
Fix dependencies inference for auto-disabled targets
Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report
Andrey Pavlenko [Mon, 14 Jan 2013 14:15:51 +0000 (18:15 +0400)]
fixinf warning on non-Windows systems
Alexander Smorkalov [Sun, 13 Jan 2013 12:27:11 +0000 (16:27 +0400)]
Documentation build warning fixes.
Invalid links and refences fixed.
SpaeseMat class documentation updated.
Andrey Pavlenko [Mon, 14 Jan 2013 10:06:00 +0000 (14:06 +0400)]
SURF keypoints rotation invariance test.
It calcs kpts for a cross and checks that 4 kpts at the edges have equal responce.
Andrey Kamaev [Mon, 14 Jan 2013 07:06:43 +0000 (11:06 +0400)]
Merge pull request #240 from emchristiansen:javatest2.4
Andrey Pavlenko [Fri, 11 Jan 2013 05:13:25 +0000 (09:13 +0400)]
more tests fixes
Andrey Kamaev [Thu, 10 Jan 2013 15:56:43 +0000 (19:56 +0400)]
Merge pull request #287 from taka-no-me:fix_cvCalcOpticalFlow_2526
Andrey Kamaev [Thu, 10 Jan 2013 15:56:26 +0000 (19:56 +0400)]
Merge pull request #288 from taka-no-me:fix_unused_cmake_variable
Andrey Kamaev [Thu, 10 Jan 2013 15:05:39 +0000 (19:05 +0400)]
Always touch variable controlling build of the module
This suppresses "unused variable" CMake warning when user explicilty disables
module unavailable in selected configuration
Andrey Kamaev [Thu, 10 Jan 2013 14:14:08 +0000 (18:14 +0400)]
Fix cvCalcOpticalFlow when the status parameter is NULL
issue 2526
Andrey Kamaev [Thu, 10 Jan 2013 12:58:36 +0000 (16:58 +0400)]
Merge pull request #284 from taka-no-me:fix_equalize_hist_2678
Andrey Kamaev [Thu, 10 Jan 2013 12:58:21 +0000 (16:58 +0400)]
Merge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output
Andrey Kamaev [Thu, 10 Jan 2013 10:45:00 +0000 (14:45 +0400)]
Fix histogram calculation in equalizeHist
issue #2678
Andrey Kamaev [Thu, 10 Jan 2013 09:31:04 +0000 (13:31 +0400)]
Merge pull request #280 from vpisarev:bug_fixes_jan9
Anna Kogan [Thu, 10 Jan 2013 09:19:59 +0000 (13:19 +0400)]
Improved console output
Anna Kogan [Thu, 10 Jan 2013 09:18:26 +0000 (13:18 +0400)]
Cleaned code
Anna Kogan [Thu, 10 Jan 2013 09:16:46 +0000 (13:16 +0400)]
Fixed last testsuit disregarding
Vadim Pisarevsky [Wed, 9 Jan 2013 13:53:19 +0000 (17:53 +0400)]
fixed bug #2679
Andrey Kamaev [Wed, 9 Jan 2013 12:53:11 +0000 (16:53 +0400)]
Merge pull request #272 from 5kg:fix_haar
Andrey Kamaev [Wed, 9 Jan 2013 12:52:56 +0000 (16:52 +0400)]
Merge pull request #278 from taka-no-me:fix_build_jpeg9
Andrey Kamaev [Wed, 9 Jan 2013 12:52:40 +0000 (16:52 +0400)]
Merge pull request #279 from taka-no-me:mingw_java
Vadim Pisarevsky [Wed, 9 Jan 2013 11:40:38 +0000 (15:40 +0400)]
Merge pull request #265 from taka-no-me:doc_signatures
Andrey Kamaev [Mon, 31 Dec 2012 00:17:36 +0000 (04:17 +0400)]
Fix build with libjpeg release 9
Andrey Kamaev [Sun, 30 Dec 2012 19:24:39 +0000 (23:24 +0400)]
Fix build of java bindings on mingw
cuda-geek [Sat, 29 Dec 2012 20:31:03 +0000 (00:31 +0400)]
Merge pull request #275 from mdim:bug_fix_cvboost
Andrey Kamaev [Sat, 29 Dec 2012 12:47:39 +0000 (16:47 +0400)]
Merge pull request #270 from wswld:2.4
Andrey Kamaev [Sat, 29 Dec 2012 11:04:10 +0000 (15:04 +0400)]
Merge pull request #271 from 5kg:fix_cascade
Maria Dimashova [Fri, 28 Dec 2012 20:30:52 +0000 (00:30 +0400)]
fixed CvBoost::predict
(Sometimes sample_data became bad because the buffer with its values was deallocated early).
Zifei Tong [Fri, 28 Dec 2012 06:44:06 +0000 (14:44 +0800)]
Changed parallel_for to parallel_for_ in haar.cpp
Andrey Pavlenko [Fri, 28 Dec 2012 13:03:35 +0000 (17:03 +0400)]
partial fix for failing tests; fix for Windows launcher script; more quiet output
Zifei Tong [Thu, 27 Dec 2012 07:43:16 +0000 (15:43 +0800)]
Fix race condition for Cascade Classifier when TBB enabled.
Vsevolod Glumov [Fri, 28 Dec 2012 11:03:20 +0000 (15:03 +0400)]
Fixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'.
Andrey Kamaev [Wed, 26 Dec 2012 13:51:04 +0000 (17:51 +0400)]
Fix discrepancies between function signatures in headers and documentation