Andrey Kamaev
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
12 years ago
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
12 years ago
Andrey Kamaev
a3954fb223
Merge pull request #729 from jet47:fix-gpu-windows-build
12 years ago
Andrey Kamaev
d619625576
Merge pull request #727 from asmorkalov:android_na_cmake
12 years ago
Andrey Kamaev
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
12 years ago
Andrey Kamaev
52fc9f7794
Merge pull request #725 from taka-no-me:fix_array_create
12 years ago
Vladislav Vinogradov
8e10cd8946
fixed gpu module compilation under windows
12 years ago
Alexander Smorkalov
f2fe89c6d8
CMakeLists.txt for Android native activity added.
12 years ago
Vladislav Vinogradov
b62cf65b91
fixed inconsistent new/delete operators
12 years ago
Vladislav Vinogradov
3d095ccc82
fixed condition in KeyPointsFilter::retainBest
12 years ago
Vladislav Vinogradov
d27d091e59
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
12 years ago
Vladislav Vinogradov
43f38df1d2
fixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount
12 years ago
Vladislav Vinogradov
3c86788b1f
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
12 years ago
Vladislav Vinogradov
d2b093d809
fixed potential dereference of null pointer
12 years ago
Vladislav Vinogradov
ce2284e2e6
removed duplication
12 years ago
Vladislav Vinogradov
5a4fa4607b
fixed misprint in imgwarp.cpp
12 years ago
Vladislav Vinogradov
ae47b8f06c
fixed misprint in icvCreateIsometricImage
12 years ago
Vladislav Vinogradov
10774ff068
removed unnecessary tmp variable (convertTo can work in-place)
12 years ago
Vladislav Vinogradov
b28677bd90
fixed misprint in MatOp::augAssignXor
12 years ago
gpsinghsandhu
77e51ff9c4
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
12 years ago
Andrey Kamaev
87bb7ff558
Merge pull request #721 from jet47:tvl1-bug-fix
12 years ago
Andrey Kamaev
6bf0181d87
Merge pull request #723 from virtuald:2.4
12 years ago
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
12 years ago
Dustin Spicuzza
b08432cfe7
Port dft.py sample from cv to cv2
12 years ago
gpsinghsandhu
0d16a9befb
In response to Bug #2927
...
change to reject contours with moms.m00 = 0.0
12 years ago
Andrey Kamaev
f77a375354
Merge branch '2.4'
12 years ago
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
)
12 years ago
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
)
12 years ago
Andrey Kamaev
3ceca9b7b1
Merge pull request #694 from mistydemeo:fix_java_detection
12 years ago
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
12 years ago
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
12 years ago
Andrey Kamaev
7ff68d5e0d
Merge pull request #711 from taka-no-me:move_keypoint_dmatch
12 years ago
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
12 years ago
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
12 years ago
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
12 years ago
Andrey Kamaev
855acc9748
Add specialization for << operator for writing std::string to FileStorage
12 years ago
Vladislav Vinogradov
924b0ef786
fixed bug in TVL1 optical flow:
...
initial optical flow was not cleaned during the second call
12 years ago
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
12 years ago
Vladislav Vinogradov
2661c2e213
fixed warnings
12 years ago
Vladislav Vinogradov
76e748ccc1
removed internal_header.hpp - it produces many warnings
12 years ago
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
12 years ago
Alexander Smorkalov
c6cab50c5c
Perf tests for Video IO on WInRT fixed.
12 years ago
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
12 years ago
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
)
12 years ago
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
12 years ago
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
12 years ago
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
12 years ago
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
12 years ago
peng xiao
04a6ab4144
Fix OCL Canny
12 years ago
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
12 years ago