platform/upstream/opencv.git
11 years agoRewrite Mat formatting without std streams
Andrey Kamaev [Tue, 2 Apr 2013 11:18:17 +0000 (15:18 +0400)]
Rewrite Mat formatting without std streams

11 years agoMove FileStorage to separate header
Andrey Kamaev [Mon, 1 Apr 2013 15:18:05 +0000 (19:18 +0400)]
Move FileStorage to separate header

11 years agoMake core/internal.hpp a private header
Andrey Kamaev [Mon, 1 Apr 2013 13:29:10 +0000 (17:29 +0400)]
Make core/internal.hpp a private header

11 years agoRemove more old definitions from internal.hpp
Andrey Kamaev [Mon, 1 Apr 2013 12:32:08 +0000 (16:32 +0400)]
Remove more old definitions from internal.hpp

11 years agoDrop template Vector class
Andrey Kamaev [Sun, 31 Mar 2013 12:54:30 +0000 (16:54 +0400)]
Drop template Vector class

11 years agoDrop outdated definitions from internal.hpp
Andrey Kamaev [Sun, 31 Mar 2013 09:26:21 +0000 (13:26 +0400)]
Drop outdated definitions from internal.hpp

This also fixes few clang build errors

11 years agoFix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create
Andrey Kamaev [Sun, 31 Mar 2013 09:24:36 +0000 (13:24 +0400)]
Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create

11 years agoDrop fast_abs
Andrey Kamaev [Sat, 30 Mar 2013 18:11:35 +0000 (22:11 +0400)]
Drop fast_abs

11 years agoDrop operator* from MatCommaInitializer
Andrey Kamaev [Sat, 30 Mar 2013 17:50:20 +0000 (21:50 +0400)]
Drop operator* from MatCommaInitializer

11 years agoRemove gcd function from core headers
Andrey Kamaev [Sat, 30 Mar 2013 17:47:42 +0000 (21:47 +0400)]
Remove gcd function from core headers

11 years agoFinalize cv::Mat transition
Andrey Kamaev [Sat, 30 Mar 2013 15:03:55 +0000 (19:03 +0400)]
Finalize cv::Mat transition

11 years agoFix MSVC build issues
Andrey Kamaev [Fri, 29 Mar 2013 20:47:22 +0000 (00:47 +0400)]
Fix MSVC build issues

11 years agoCompletely separate C and C++ API of OpenCV core
Andrey Kamaev [Fri, 29 Mar 2013 08:59:55 +0000 (12:59 +0400)]
Completely separate C and C++ API of OpenCV core

11 years agoMove cv::Mat out of core.hpp
Andrey Kamaev [Thu, 28 Mar 2013 17:01:12 +0000 (21:01 +0400)]
Move cv::Mat out of core.hpp

11 years agoMove cv::TermCriteria out of core.hpp
Andrey Kamaev [Thu, 28 Mar 2013 14:22:40 +0000 (18:22 +0400)]
Move cv::TermCriteria out of core.hpp

11 years agoRename mat.hpp
Andrey Kamaev [Thu, 28 Mar 2013 14:22:24 +0000 (18:22 +0400)]
Rename mat.hpp

11 years agoMove cv::fastMalloc, cv::fastFree and cv::Ptr out of core.hpp
Andrey Kamaev [Thu, 28 Mar 2013 12:47:45 +0000 (16:47 +0400)]
Move cv::fastMalloc, cv::fastFree and cv::Ptr out of core.hpp

11 years agoMove implementation of C++ container classes to types.hpp
Andrey Kamaev [Thu, 28 Mar 2013 08:48:00 +0000 (12:48 +0400)]
Move implementation of C++ container classes to types.hpp

11 years agoNorms are moved out form operations.hpp
Andrey Kamaev [Wed, 27 Mar 2013 15:06:31 +0000 (19:06 +0400)]
Norms are moved out form operations.hpp

11 years agoImplementation of cv::Matx and cv::Vec is almost moved to matx.hpp
Andrey Kamaev [Wed, 27 Mar 2013 14:43:06 +0000 (18:43 +0400)]
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp

11 years agoMove cv::Matx and cv::Vec to separate header
Andrey Kamaev [Wed, 27 Mar 2013 11:54:04 +0000 (15:54 +0400)]
Move cv::Matx and cv::Vec to separate header

11 years agoMove cv::Scalar_ to types.hpp
Andrey Kamaev [Wed, 27 Mar 2013 10:58:57 +0000 (14:58 +0400)]
Move cv::Scalar_ to types.hpp

11 years agoMove most of the traits classes out of core.hpp
Andrey Kamaev [Wed, 27 Mar 2013 09:20:29 +0000 (13:20 +0400)]
Move most of the traits classes out of core.hpp

11 years agoMove cv::Range, cv::KeyPoint and cv::DMatch
Andrey Kamaev [Tue, 26 Mar 2013 17:26:43 +0000 (21:26 +0400)]
Move cv::Range, cv::KeyPoint and cv::DMatch

11 years agoMove cv::RotatedRect
Andrey Kamaev [Tue, 26 Mar 2013 16:59:45 +0000 (20:59 +0400)]
Move cv::RotatedRect

11 years agoMove cv::Rect_
Andrey Kamaev [Tue, 26 Mar 2013 16:43:27 +0000 (20:43 +0400)]
Move cv::Rect_

11 years agoMove cv::Size_
Andrey Kamaev [Tue, 26 Mar 2013 16:23:40 +0000 (20:23 +0400)]
Move cv::Size_

11 years agoMove C++ basic structures to separate header and inverse dependency from C API
Andrey Kamaev [Tue, 26 Mar 2013 15:48:50 +0000 (19:48 +0400)]
Move C++ basic structures to separate header and inverse dependency from C API

cv::Complex, cv::Point_ and cv::Point3_ are moved.

11 years agoMove C structures wrappers from core.hpp to core_c.h
Andrey Kamaev [Tue, 26 Mar 2013 14:44:18 +0000 (18:44 +0400)]
Move C structures wrappers from core.hpp to core_c.h

Also move RTTIImpl class to the only usage

11 years agoDrop CvModule and cvSetMemoryManager
Andrey Kamaev [Tue, 26 Mar 2013 14:15:58 +0000 (18:15 +0400)]
Drop CvModule and cvSetMemoryManager

11 years agoMerge pull request #720 from taka-no-me:drop_sort
Andrey Kamaev [Mon, 1 Apr 2013 11:14:45 +0000 (15:14 +0400)]
Merge pull request #720 from taka-no-me:drop_sort

11 years agoMerge branch '2.4'
Andrey Kamaev [Fri, 29 Mar 2013 14:48:06 +0000 (18:48 +0400)]
Merge branch '2.4'

11 years agoFix ant/Java detection in cmake scripts
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)

11 years agoUpdate operations_on_arrays.rst
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)

11 years agoMerge pull request #694 from mistydemeo:fix_java_detection
Andrey Kamaev [Fri, 29 Mar 2013 14:24:11 +0000 (18:24 +0400)]
Merge pull request #694 from mistydemeo:fix_java_detection

11 years agoMerge pull request #719 from jet47:gpu-fix-build
Andrey Kamaev [Fri, 29 Mar 2013 14:23:05 +0000 (18:23 +0400)]
Merge pull request #719 from jet47:gpu-fix-build

11 years agoMerge pull request #717 from ryanobjc:patch-1
Andrey Kamaev [Fri, 29 Mar 2013 14:21:59 +0000 (18:21 +0400)]
Merge pull request #717 from ryanobjc:patch-1

11 years agoMerge pull request #711 from taka-no-me:move_keypoint_dmatch
Andrey Kamaev [Fri, 29 Mar 2013 14:21:37 +0000 (18:21 +0400)]
Merge pull request #711 from taka-no-me:move_keypoint_dmatch

11 years agoMerge pull request #718 from apavlenko:java_tests_fix
Andrey Kamaev [Fri, 29 Mar 2013 14:21:14 +0000 (18:21 +0400)]
Merge pull request #718 from apavlenko:java_tests_fix

11 years agoMerge pull request #707 from pengx17:2.4_surf
Andrey Kamaev [Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)]
Merge pull request #707 from pengx17:2.4_surf

11 years agoMerge pull request #704 from taka-no-me:folders
Andrey Kamaev [Fri, 29 Mar 2013 14:20:26 +0000 (18:20 +0400)]
Merge pull request #704 from taka-no-me:folders

11 years agoAdd specialization for << operator for writing std::string to FileStorage
Andrey Kamaev [Fri, 29 Mar 2013 12:27:12 +0000 (16:27 +0400)]
Add specialization for << operator for writing std::string to FileStorage

11 years agoRemove inline sorting algorithms from core headers
Andrey Kamaev [Thu, 28 Mar 2013 12:12:13 +0000 (16:12 +0400)]
Remove inline sorting algorithms from core headers

11 years agofixed warnings
Vladislav Vinogradov [Thu, 28 Mar 2013 07:49:47 +0000 (11:49 +0400)]
fixed warnings

11 years agoremoved internal_header.hpp - it produces many warnings
Vladislav Vinogradov [Wed, 27 Mar 2013 12:28:46 +0000 (16:28 +0400)]
removed internal_header.hpp - it produces many warnings

11 years agofixed gpu module compilation
Vladislav Vinogradov [Wed, 27 Mar 2013 09:07:58 +0000 (13:07 +0400)]
fixed gpu module compilation

11 years agoFix for encoding errors when building Java source
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)

11 years agoUpdate operations_on_arrays.rst
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 -

11 years agoMerge pull request #715 from pengx17:2.4_canny_buf
Andrey Kamaev [Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)]
Merge pull request #715 from pengx17:2.4_canny_buf

11 years agoMerge pull request #712 from apavlenko:fix-2912
Andrey Kamaev [Wed, 27 Mar 2013 09:19:27 +0000 (13:19 +0400)]
Merge pull request #712 from apavlenko:fix-2912

11 years agoFix OCL Canny
peng xiao [Wed, 27 Mar 2013 07:08:51 +0000 (15:08 +0800)]
Fix OCL Canny

11 years agoDisable ocl::SURF accurate test
peng xiao [Wed, 27 Mar 2013 05:25:08 +0000 (13:25 +0800)]
Disable ocl::SURF accurate test

11 years agoFix compiler errors
peng xiao [Wed, 27 Mar 2013 00:56:31 +0000 (08:56 +0800)]
Fix compiler errors

11 years agofix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
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)

11 years agoMerge pull request #705 from bitwangyaoyao:2.4_oclFix
Andrey Kamaev [Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)]
Merge pull request #705 from bitwangyaoyao:2.4_oclFix

11 years agoMerge pull request #692 from vpisarev:refactor_calib3d_stereo
Andrey Kamaev [Tue, 26 Mar 2013 14:38:15 +0000 (18:38 +0400)]
Merge pull request #692 from vpisarev:refactor_calib3d_stereo

11 years agoMove documentation for cv::KeyPoint and cv::DMatch to core
Andrey Kamaev [Tue, 26 Mar 2013 13:20:51 +0000 (17:20 +0400)]
Move documentation for cv::KeyPoint and cv::DMatch to core

11 years agoMove 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

11 years agoMerge pull request #710 from jet47:gpu-fix-compilation-issues
Andrey Kamaev [Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)]
Merge pull request #710 from jet47:gpu-fix-compilation-issues

11 years agoMerge pull request #709 from taka-no-me:cv_format
Andrey Kamaev [Tue, 26 Mar 2013 10:36:47 +0000 (14:36 +0400)]
Merge pull request #709 from taka-no-me:cv_format

11 years agoMerge pull request #708 from taka-no-me:gstreamer_10_28
Andrey Kamaev [Tue, 26 Mar 2013 10:36:25 +0000 (14:36 +0400)]
Merge pull request #708 from taka-no-me:gstreamer_10_28

11 years agoMerge pull request #706 from taka-no-me:str_gpumat
Andrey Kamaev [Tue, 26 Mar 2013 10:36:09 +0000 (14:36 +0400)]
Merge pull request #706 from taka-no-me:str_gpumat

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 09:23:38 +0000 (17:23 +0800)]
Fix compiler errors

11 years agoFix build with gstreamer 0.10.28
Andrey Kamaev [Tue, 26 Mar 2013 08:27:39 +0000 (12:27 +0400)]
Fix build with gstreamer 0.10.28

11 years agoavoid explicit std::string use
Vadim Pisarevsky [Tue, 26 Mar 2013 08:55:21 +0000 (12:55 +0400)]
avoid explicit std::string use

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 08:40:30 +0000 (16:40 +0800)]
Fix compiler errors

11 years agofixed compilation issues with gpu modules:
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

11 years agoMore accurate implementation of cv::format
Andrey Kamaev [Tue, 26 Mar 2013 07:54:04 +0000 (11:54 +0400)]
More accurate implementation of cv::format

11 years agoPass warp size into SURF
peng xiao [Tue, 26 Mar 2013 07:48:15 +0000 (15:48 +0800)]
Pass warp size into SURF

11 years agoAdd a function to query ocl device info
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

11 years agoFix std::string to cv::String migration problems in gpumat.cpp
Andrey Kamaev [Tue, 26 Mar 2013 07:24:54 +0000 (11:24 +0400)]
Fix std::string to cv::String migration problems in gpumat.cpp

11 years agoMerge pull request #702 from taka-no-me:refactor_core_headers
Andrey Kamaev [Tue, 26 Mar 2013 07:00:03 +0000 (11:00 +0400)]
Merge pull request #702 from taka-no-me:refactor_core_headers

11 years agomore fix
yao [Tue, 26 Mar 2013 06:23:26 +0000 (14:23 +0800)]
more fix

11 years agomore fix of mismatch
yao [Tue, 26 Mar 2013 06:10:29 +0000 (14:10 +0800)]
more fix of mismatch

11 years agomore fix of mismatch functions on CPU OCL
yao [Tue, 26 Mar 2013 05:41:13 +0000 (13:41 +0800)]
more fix of mismatch functions on CPU OCL

11 years agofix some mismatch
yao [Tue, 26 Mar 2013 05:05:01 +0000 (13:05 +0800)]
fix some mismatch

11 years agodiscard comments in kernels.cpp
yao [Tue, 26 Mar 2013 04:01:01 +0000 (12:01 +0800)]
discard comments in kernels.cpp

11 years agoAdd a macro to call additional barrier function on the fly
peng xiao [Tue, 26 Mar 2013 03:51:02 +0000 (11:51 +0800)]
Add a macro to call additional barrier function on the fly

11 years agofix amdFft and amdBlas path
yao [Tue, 26 Mar 2013 03:48:14 +0000 (11:48 +0800)]
fix amdFft and amdBlas path

11 years agoDrop outdated targets and fix solution folders
Andrey Kamaev [Mon, 25 Mar 2013 17:57:53 +0000 (21:57 +0400)]
Drop outdated targets and fix solution folders

11 years agoMerge pull request #703 from jacob-baines:patch-2
Andrey Kamaev [Mon, 25 Mar 2013 16:26:39 +0000 (20:26 +0400)]
Merge pull request #703 from jacob-baines:patch-2

11 years agoMerge pull request #701 from jet47:clahe
Andrey Kamaev [Mon, 25 Mar 2013 16:26:22 +0000 (20:26 +0400)]
Merge pull request #701 from jet47:clahe

11 years agoFix clang build for Android (CV_XADD)
Andrey Kamaev [Mon, 25 Mar 2013 14:06:02 +0000 (18:06 +0400)]
Fix clang build for Android (CV_XADD)

11 years agoMemory Leak Fix
Jacob Baines [Mon, 25 Mar 2013 14:02:50 +0000 (11:02 -0300)]
Memory Leak Fix

Memory leak in BoostedSoftCascadeOctave::traverse

11 years agoGPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:39:07 +0000 (15:39 +0400)]
GPU implementation of CLAHE

11 years agoCPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:38:43 +0000 (15:38 +0400)]
CPU implementation of CLAHE

11 years agoFix globbing failure when stat call fails
Andrey Kamaev [Mon, 25 Mar 2013 13:38:50 +0000 (17:38 +0400)]
Fix globbing failure when stat call fails

11 years agoMerge pull request #684 from vhdirk:gstreamer-1.x
Andrey Kamaev [Mon, 25 Mar 2013 13:01:41 +0000 (17:01 +0400)]
Merge pull request #684 from vhdirk:gstreamer-1.x

11 years agoMove implementation of cv::String methods out of class definition
Andrey Kamaev [Mon, 25 Mar 2013 12:01:23 +0000 (16:01 +0400)]
Move implementation of cv::String methods out of class definition

11 years agoUse C++ style includes when compiled as C++
Andrey Kamaev [Mon, 25 Mar 2013 12:01:06 +0000 (16:01 +0400)]
Use C++ style includes when compiled as C++

11 years agoMerge pull request #698 from vpisarev/ms_visimage_tut24
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

11 years agoMerge pull request #697 from Nerei/ios_png_jpeg
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

11 years agoMerge pull request #700 from cuda-geek/fix_build_with_cuda
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

11 years agoMerge pull request #699 from jacob-baines/patch-1
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

11 years agoMerge pull request #695 from taka-no-me/cv_str
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

11 years agoMerge pull request #671 from cuda-geek/static_assert
Andrey Kamaev [Mon, 25 Mar 2013 10:23:20 +0000 (03:23 -0700)]
Merge pull request #671 from cuda-geek/static_assert

Static assert

11 years agofixed hopefully last warnings in the doc builder
Vadim Pisarevsky [Mon, 25 Mar 2013 08:04:11 +0000 (12:04 +0400)]
fixed hopefully last warnings in the doc builder

11 years agoenabled png and jpeg for iOS
Anatoly Baksheev [Sun, 24 Mar 2013 16:07:55 +0000 (20:07 +0400)]
enabled png and jpeg for iOS

11 years agofix build gpu tests after video module refactoring
marina.kolpakova [Mon, 25 Mar 2013 05:34:51 +0000 (09:34 +0400)]
fix build gpu tests after video module refactoring

11 years agofixed build with CUDA after latest merge
marina.kolpakova [Fri, 22 Mar 2013 06:21:04 +0000 (10:21 +0400)]
fixed build with CUDA after latest merge