Andrey Kamaev [Wed, 3 Apr 2013 11:58:31 +0000 (15:58 +0400)]
Merge pull request #737 from AoD314:webp2
Andrey Kamaev [Wed, 3 Apr 2013 11:58:17 +0000 (15:58 +0400)]
Merge pull request #722 from gpsinghsandhu:blob-detector-cpp
AoD314 [Tue, 2 Apr 2013 11:22:10 +0000 (15:22 +0400)]
update libwebp up to 0.3.0
Andrey Kamaev [Mon, 1 Apr 2013 11:14:45 +0000 (15:14 +0400)]
Merge pull request #720 from taka-no-me:drop_sort
gpsinghsandhu [Sun, 31 Mar 2013 10:43:40 +0000 (16:13 +0530)]
contours with zero area rejected
reject contours with zero area by using the "continue" statement to be in sync with the condition checking style used in the whole file
gpsinghsandhu [Fri, 29 Mar 2013 19:03:22 +0000 (00:33 +0530)]
In response to Bug #2927
change to reject contours with moms.m00 = 0.0
Andrey Kamaev [Fri, 29 Mar 2013 14:48:06 +0000 (18:48 +0400)]
Merge branch '2.4'
Misty De Meo [Fri, 22 Mar 2013 16:18:42 +0000 (11:18 -0500)]
Fix ant/Java detection in cmake scripts
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit
a423afddc143f4b10e09e7b253a420b29f877b6c)
Ryan Rawson [Wed, 27 Mar 2013 09:52:53 +0000 (02:52 -0700)]
Update operations_on_arrays.rst
Remove weirdo unicode – and just use a normal -(cherry picked from commit
0d49de51b79eacccf5b93a6fa67478a59ffd246d)
Andrey Kamaev [Fri, 29 Mar 2013 14:24:11 +0000 (18:24 +0400)]
Merge pull request #694 from mistydemeo:fix_java_detection
Andrey Kamaev [Fri, 29 Mar 2013 14:23:05 +0000 (18:23 +0400)]
Merge pull request #719 from jet47:gpu-fix-build
Andrey Kamaev [Fri, 29 Mar 2013 14:21:59 +0000 (18:21 +0400)]
Merge pull request #717 from ryanobjc:patch-1
Andrey Kamaev [Fri, 29 Mar 2013 14:21:37 +0000 (18:21 +0400)]
Merge pull request #711 from taka-no-me:move_keypoint_dmatch
Andrey Kamaev [Fri, 29 Mar 2013 14:21:14 +0000 (18:21 +0400)]
Merge pull request #718 from apavlenko:java_tests_fix
Andrey Kamaev [Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)]
Merge pull request #707 from pengx17:2.4_surf
Andrey Kamaev [Fri, 29 Mar 2013 14:20:26 +0000 (18:20 +0400)]
Merge pull request #704 from taka-no-me:folders
Andrey Kamaev [Fri, 29 Mar 2013 12:27:12 +0000 (16:27 +0400)]
Add specialization for << operator for writing std::string to FileStorage
Andrey Kamaev [Thu, 28 Mar 2013 12:12:13 +0000 (16:12 +0400)]
Remove inline sorting algorithms from core headers
Vladislav Vinogradov [Thu, 28 Mar 2013 07:49:47 +0000 (11:49 +0400)]
fixed warnings
Vladislav Vinogradov [Wed, 27 Mar 2013 12:28:46 +0000 (16:28 +0400)]
removed internal_header.hpp - it produces many warnings
Vladislav Vinogradov [Wed, 27 Mar 2013 09:07:58 +0000 (13:07 +0400)]
fixed gpu module compilation
Alexander Bohn / FI$H2k [Fri, 15 Mar 2013 09:47:52 +0000 (06:47 -0300)]
Fix for encoding errors when building Java source
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit
f3ee55e04222deea30ffe4e89456c220bc75ff1a)
Ryan Rawson [Wed, 27 Mar 2013 09:52:53 +0000 (02:52 -0700)]
Update operations_on_arrays.rst
Remove weirdo unicode – and just use a normal -
Andrey Kamaev [Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)]
Merge pull request #715 from pengx17:2.4_canny_buf
Andrey Kamaev [Wed, 27 Mar 2013 09:19:27 +0000 (13:19 +0400)]
Merge pull request #712 from apavlenko:fix-2912
peng xiao [Wed, 27 Mar 2013 07:08:51 +0000 (15:08 +0800)]
Fix OCL Canny
peng xiao [Wed, 27 Mar 2013 05:25:08 +0000 (13:25 +0800)]
Disable ocl::SURF accurate test
peng xiao [Wed, 27 Mar 2013 00:56:31 +0000 (08:56 +0800)]
Fix compiler errors
Andrey Pavlenko [Tue, 26 Mar 2013 15:31:16 +0000 (19:31 +0400)]
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
Andrey Kamaev [Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)]
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
Andrey Kamaev [Tue, 26 Mar 2013 14:38:15 +0000 (18:38 +0400)]
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
Andrey Kamaev [Tue, 26 Mar 2013 13:20:51 +0000 (17:20 +0400)]
Move documentation for cv::KeyPoint and cv::DMatch to core
Andrey Kamaev [Tue, 26 Mar 2013 10:58:09 +0000 (14:58 +0400)]
Move cv::KeyPoint and cv::DMatch to core
Andrey Kamaev [Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)]
Merge pull request #710 from jet47:gpu-fix-compilation-issues
Andrey Kamaev [Tue, 26 Mar 2013 10:36:47 +0000 (14:36 +0400)]
Merge pull request #709 from taka-no-me:cv_format
Andrey Kamaev [Tue, 26 Mar 2013 10:36:25 +0000 (14:36 +0400)]
Merge pull request #708 from taka-no-me:gstreamer_10_28
Andrey Kamaev [Tue, 26 Mar 2013 10:36:09 +0000 (14:36 +0400)]
Merge pull request #706 from taka-no-me:str_gpumat
peng xiao [Tue, 26 Mar 2013 09:23:38 +0000 (17:23 +0800)]
Fix compiler errors
Andrey Kamaev [Tue, 26 Mar 2013 08:27:39 +0000 (12:27 +0400)]
Fix build with gstreamer 0.10.28
Vadim Pisarevsky [Tue, 26 Mar 2013 08:55:21 +0000 (12:55 +0400)]
avoid explicit std::string use
peng xiao [Tue, 26 Mar 2013 08:40:30 +0000 (16:40 +0800)]
Fix compiler errors
Vladislav Vinogradov [Tue, 26 Mar 2013 08:33:13 +0000 (12:33 +0400)]
fixed compilation issues with gpu modules:
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
Andrey Kamaev [Tue, 26 Mar 2013 07:54:04 +0000 (11:54 +0400)]
More accurate implementation of cv::format
peng xiao [Tue, 26 Mar 2013 07:48:15 +0000 (15:48 +0800)]
Pass warp size into SURF
peng xiao [Tue, 26 Mar 2013 07:36:49 +0000 (15:36 +0800)]
Add a function to query ocl device info
Currently the function only supports wavefront size query
Andrey Kamaev [Tue, 26 Mar 2013 07:24:54 +0000 (11:24 +0400)]
Fix std::string to cv::String migration problems in gpumat.cpp
Andrey Kamaev [Tue, 26 Mar 2013 07:00:03 +0000 (11:00 +0400)]
Merge pull request #702 from taka-no-me:refactor_core_headers
yao [Tue, 26 Mar 2013 06:23:26 +0000 (14:23 +0800)]
more fix
yao [Tue, 26 Mar 2013 06:10:29 +0000 (14:10 +0800)]
more fix of mismatch
yao [Tue, 26 Mar 2013 05:41:13 +0000 (13:41 +0800)]
more fix of mismatch functions on CPU OCL
yao [Tue, 26 Mar 2013 05:05:01 +0000 (13:05 +0800)]
fix some mismatch
yao [Tue, 26 Mar 2013 04:01:01 +0000 (12:01 +0800)]
discard comments in kernels.cpp
peng xiao [Tue, 26 Mar 2013 03:51:02 +0000 (11:51 +0800)]
Add a macro to call additional barrier function on the fly
yao [Tue, 26 Mar 2013 03:48:14 +0000 (11:48 +0800)]
fix amdFft and amdBlas path
Andrey Kamaev [Mon, 25 Mar 2013 17:57:53 +0000 (21:57 +0400)]
Drop outdated targets and fix solution folders
Andrey Kamaev [Mon, 25 Mar 2013 16:26:39 +0000 (20:26 +0400)]
Merge pull request #703 from jacob-baines:patch-2
Andrey Kamaev [Mon, 25 Mar 2013 16:26:22 +0000 (20:26 +0400)]
Merge pull request #701 from jet47:clahe
Andrey Kamaev [Mon, 25 Mar 2013 14:06:02 +0000 (18:06 +0400)]
Fix clang build for Android (CV_XADD)
Jacob Baines [Mon, 25 Mar 2013 14:02:50 +0000 (11:02 -0300)]
Memory Leak Fix
Memory leak in BoostedSoftCascadeOctave::traverse
Vladislav Vinogradov [Mon, 25 Mar 2013 11:39:07 +0000 (15:39 +0400)]
GPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:38:43 +0000 (15:38 +0400)]
CPU implementation of CLAHE
Andrey Kamaev [Mon, 25 Mar 2013 13:38:50 +0000 (17:38 +0400)]
Fix globbing failure when stat call fails
Andrey Kamaev [Mon, 25 Mar 2013 13:01:41 +0000 (17:01 +0400)]
Merge pull request #684 from vhdirk:gstreamer-1.x
Andrey Kamaev [Mon, 25 Mar 2013 12:01:23 +0000 (16:01 +0400)]
Move implementation of cv::String methods out of class definition
Andrey Kamaev [Mon, 25 Mar 2013 12:01:06 +0000 (16:01 +0400)]
Use C++ style includes when compiled as C++
Andrey Kamaev [Mon, 25 Mar 2013 10:29:13 +0000 (03:29 -0700)]
Merge pull request #698 from vpisarev/ms_visimage_tut24
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
Andrey Kamaev [Mon, 25 Mar 2013 10:28:29 +0000 (03:28 -0700)]
Merge pull request #697 from Nerei/ios_png_jpeg
Enabled png and jpeg for iOS
Andrey Kamaev [Mon, 25 Mar 2013 10:27:31 +0000 (03:27 -0700)]
Merge pull request #700 from cuda-geek/fix_build_with_cuda
fix master build with CUDA after latest 2.4 merge
Andrey Kamaev [Mon, 25 Mar 2013 10:26:18 +0000 (03:26 -0700)]
Merge pull request #699 from jacob-baines/patch-1
Mismatching new[] / delete
Andrey Kamaev [Mon, 25 Mar 2013 10:24:42 +0000 (03:24 -0700)]
Merge pull request #695 from taka-no-me/cv_str
cv::String to replace the std::string
Andrey Kamaev [Mon, 25 Mar 2013 10:23:20 +0000 (03:23 -0700)]
Merge pull request #671 from cuda-geek/static_assert
Static assert
Vadim Pisarevsky [Mon, 25 Mar 2013 08:04:11 +0000 (12:04 +0400)]
fixed hopefully last warnings in the doc builder
Anatoly Baksheev [Sun, 24 Mar 2013 16:07:55 +0000 (20:07 +0400)]
enabled png and jpeg for iOS
marina.kolpakova [Mon, 25 Mar 2013 05:34:51 +0000 (09:34 +0400)]
fix build gpu tests after video module refactoring
marina.kolpakova [Fri, 22 Mar 2013 06:21:04 +0000 (10:21 +0400)]
fixed build with CUDA after latest merge
Jacob Baines [Mon, 25 Mar 2013 01:45:31 +0000 (22:45 -0300)]
Mismatching new[] / delete
Vadim Pisarevsky [Sun, 24 Mar 2013 20:42:46 +0000 (00:42 +0400)]
fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs
marina.kolpakova [Tue, 19 Mar 2013 21:52:40 +0000 (01:52 +0400)]
use static assertation where suitable
marina.kolpakova [Wed, 13 Mar 2013 23:28:48 +0000 (03:28 +0400)]
static assert
Vadim Pisarevsky [Sun, 24 Mar 2013 19:48:35 +0000 (23:48 +0400)]
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
Vadim Pisarevsky [Sun, 24 Mar 2013 19:09:17 +0000 (23:09 +0400)]
fixed docs and compile error on Linux
Andrey Kamaev [Fri, 22 Mar 2013 17:17:13 +0000 (21:17 +0400)]
Fix build of ocl module
Andrey Kamaev [Fri, 22 Mar 2013 16:51:45 +0000 (20:51 +0400)]
Update documentation
Andrey Kamaev [Fri, 22 Mar 2013 16:37:49 +0000 (20:37 +0400)]
Drop cv:: prefix from cv::String used inside the cv namespace
Andrey Kamaev [Fri, 22 Mar 2013 15:31:36 +0000 (19:31 +0400)]
Remove all include directives for <string>
Andrey Kamaev [Fri, 22 Mar 2013 14:59:43 +0000 (18:59 +0400)]
Use cv::String in Android camera wrapper
Andrey Kamaev [Fri, 22 Mar 2013 14:15:48 +0000 (18:15 +0400)]
Fix build of various backends
Andrey Kamaev [Fri, 22 Mar 2013 13:01:56 +0000 (17:01 +0400)]
Fix build of apps and samples
Andrey Kamaev [Wed, 20 Mar 2013 16:46:22 +0000 (20:46 +0400)]
Java wrapper is adapted for cv::String
Andrey Kamaev [Wed, 20 Mar 2013 16:42:07 +0000 (20:42 +0400)]
Python wrapper is adapted for cv::String
Andrey Kamaev [Wed, 20 Mar 2013 16:13:46 +0000 (20:13 +0400)]
All modules (except ocl and gpu) compiles and pass tests
Andrey Kamaev [Wed, 20 Mar 2013 13:53:13 +0000 (17:53 +0400)]
Compile opencv_test_core with cv::String instead of std::string
All tests passed!
Andrey Kamaev [Wed, 20 Mar 2013 09:00:04 +0000 (13:00 +0400)]
Add cv::String class
Misty De Meo [Fri, 22 Mar 2013 16:18:42 +0000 (11:18 -0500)]
Fix ant/Java detection in cmake scripts
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.
Andrey Kamaev [Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)]
Merge pull request #690 from berak:master
Andrey Kamaev [Fri, 22 Mar 2013 15:34:52 +0000 (19:34 +0400)]
Merge pull request #680 from vpisarev:c2cpp_video_take2
Andrey Kamaev [Fri, 22 Mar 2013 13:18:54 +0000 (17:18 +0400)]
Merge pull request #691 from vpisarev:fix_2899
Andrey Kamaev [Fri, 22 Mar 2013 13:18:40 +0000 (17:18 +0400)]
Merge pull request #688 from jet47:fix-nonfree-compilation
Andrey Kamaev [Fri, 22 Mar 2013 13:18:14 +0000 (17:18 +0400)]
Merge pull request #683 from jet47:gpu-license
Vadim Pisarevsky [Fri, 22 Mar 2013 11:12:55 +0000 (15:12 +0400)]
removed extra whitespaces