Andrey Kamaev
6bf0181d87
Merge pull request #723 from virtuald:2.4
2013-03-31 13:45:55 +04:00
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
Dustin Spicuzza
b08432cfe7
Port dft.py sample from cv to cv2
2013-03-29 17:37:00 -04:00
gpsinghsandhu
0d16a9befb
In response to Bug #2927
...
change to reject contours with moms.m00 = 0.0
2013-03-30 00:33:22 +05:30
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Misty De Meo
e143706ef9
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 a423afddc1
2013-03-29 18:29:40 +04:00
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
2013-03-29 18:29:29 +04:00
Andrey Kamaev
3ceca9b7b1
Merge pull request #694 from mistydemeo:fix_java_detection
2013-03-29 18:24:11 +04:00
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
2013-03-29 18:23:05 +04:00
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
2013-03-29 18:21:59 +04:00
Andrey Kamaev
7ff68d5e0d
Merge pull request #711 from taka-no-me:move_keypoint_dmatch
2013-03-29 18:21:38 +04:00
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Andrey Kamaev
855acc9748
Add specialization for << operator for writing std::string to FileStorage
2013-03-29 16:27:12 +04:00
Vladislav Vinogradov
924b0ef786
fixed bug in TVL1 optical flow:
...
initial optical flow was not cleaned during the second call
2013-03-29 10:40:28 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
2661c2e213
fixed warnings
2013-03-28 11:49:47 +04:00
Vladislav Vinogradov
76e748ccc1
removed internal_header.hpp - it produces many warnings
2013-03-28 11:49:26 +04:00
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
2013-03-28 11:48:43 +04:00
Alexander Smorkalov
c6cab50c5c
Perf tests for Video IO on WInRT fixed.
2013-03-28 00:15:30 -07:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Bohn / FI$H2k
c66cf08ced
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 f3ee55e042
2013-03-27 17:43:00 +04:00
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
2013-03-27 02:52:53 -07:00
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
2013-03-27 13:19:40 +04:00
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
2013-03-27 13:19:27 +04:00
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
2013-03-27 00:45:41 -07:00
peng xiao
04a6ab4144
Fix OCL Canny
2013-03-27 15:08:51 +08:00
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
yao
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
peng xiao
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 18:38:36 +04:00
Andrey Kamaev
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
2013-03-26 18:38:16 +04:00
Andrey Kamaev
2edfae5070
Move documentation for cv::KeyPoint and cv::DMatch to core
2013-03-26 17:20:51 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
6a6ae355b1
Merge pull request #710 from jet47:gpu-fix-compilation-issues
2013-03-26 15:31:22 +04:00
Andrey Kamaev
8eff34ee0b
Merge pull request #709 from taka-no-me:cv_format
2013-03-26 14:36:47 +04:00
Andrey Kamaev
6e2708e042
Merge pull request #708 from taka-no-me:gstreamer_10_28
2013-03-26 14:36:25 +04:00
Andrey Kamaev
0e58853be3
Merge pull request #706 from taka-no-me:str_gpumat
2013-03-26 14:36:10 +04:00
peng xiao
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
Andrey Kamaev
6377922716
Fix build with gstreamer 0.10.28
2013-03-26 13:10:09 +04:00
Vadim Pisarevsky
322d781192
avoid explicit std::string use
2013-03-26 12:55:21 +04:00
peng xiao
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
Vladislav Vinogradov
4dbd0f0e8f
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
2013-03-26 12:33:13 +04:00
Andrey Kamaev
2107ea9773
More accurate implementation of cv::format
2013-03-26 11:54:04 +04:00
peng xiao
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
peng xiao
0c19a07bf4
Add a function to query ocl device info
...
Currently the function only supports wavefront size query
2013-03-26 15:36:49 +08:00
Andrey Kamaev
5fd58a0103
Fix std::string to cv::String migration problems in gpumat.cpp
2013-03-26 11:24:54 +04:00
