Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
12 years ago
Andrey Pavlenko
8a3aa1f5b6
Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004
12 years ago
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
12 years ago
Philippe FOUBERT
ebd413c696
Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.
...
Symptoms:
CMake Error at CMakeLists.txt:10 (add_executable):
Target "my_app" links to item "C:/Program Files " which has leading
or trailing whitespace. This is now an error according to policy CMP0004.
This problem occurs when building on Windows when we depend on libraries located (for example) in "C:\Program Files (x86)..."
12 years ago
Andrey Pavlenko
4ed9b1ca9a
Merge pull request #1166 from StevenPuttemans:patch_2288
12 years ago
StevenPuttemans
f33fe94c0d
Added the sample from patch #2288 : reading in sequence of images
...
Added bugfixes
- Changed CV_WINDOW_NORMAL to 1
- Changed the help function to static
- Added extra help information on mask specifics
12 years ago
Andrey Pavlenko
a77456e8aa
Merge pull request #1208 from berak:Bug_3094
12 years ago
berak
03c4a6299b
expanded the CV_Assert in pyrdown_ to check for empty mats
12 years ago
Andrey Pavlenko
c4e1edbb83
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
12 years ago
Andrey Pavlenko
93923141d5
Merge pull request #1108 from nailbiter:optimLP
12 years ago
Andrey Pavlenko
b31293c984
Merge pull request #1194 from SpecLad:no-const-inputarray
12 years ago
Andrey Pavlenko
cd62f9f7cb
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
12 years ago
Andrey Pavlenko
c5e569d178
Merge pull request #1204 from berak:Bug_3170
12 years ago
Andrey Pavlenko
41d180f90a
Merge pull request #1198 from znah:py_flann_fix
12 years ago
Alex Leontiev
3013ad6624
Minor fixes
...
Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
#endif
12 years ago
Andrey Pavlenko
9e8dd28b0e
Merge pull request #1200 from shervinemami:patch-1
12 years ago
berak
1b10860f36
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
12 years ago
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
12 years ago
Alexander Mordvintsev
25b9ac18e6
fixed Bug #3143 - flann 'not implemented' error
12 years ago
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
12 years ago
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
12 years ago
Alex Leontiev
52b250f466
Minor fixes
...
Fixing failed build.
12 years ago
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
12 years ago
Roman Donchenko
98d36a4037
Merge pull request #1171 from SpecLad:drop-legacy-options
12 years ago
Roman Donchenko
4e1e0c9ee3
Merge pull request #1180 from nghiaho12:master
12 years ago
Nghia Ho
eb2720a908
missing fclose when returning early
12 years ago
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
12 years ago
Roman Donchenko
b2d359b6ac
Merge pull request #1170 from SpecLad:merge-2.4
12 years ago
lluis
c4f88b0687
removed some unnecessary ERStat members as they are easily computable from others
12 years ago
lluis
43e7e6e475
removed extra cv:: scope qualifiers for better readability
12 years ago
lluis
2087d4602b
using Rect for storing the bounding box instead of an integer array
12 years ago
lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
12 years ago
Roman Donchenko
abe4219256
Drop the legacy CMake options.
...
3.0 seems like an appropriate time to do that.
12 years ago
Roman Donchenko
3939d78336
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
12 years ago
Daniel Angelov
ae93a3e681
The accurate LineSegmentDetector object.
12 years ago
Daniel Angelov
26847f92b3
Fixed the sample.
12 years ago
Roman Donchenko
38a0b47b2f
Merge pull request #1165 from vpisarev:24_ipp
12 years ago
Roman Donchenko
ef91d7e883
Merge pull request #1153 from abidrahmank:bgdGMG_docs
12 years ago
Daniel Angelov
982ccd784e
Added the update on the sample.
12 years ago
Vadim Pisarevsky
8b6afd697d
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
12 years ago
yao
3d3e9ab635
Fix the problem of haar caused by merge
12 years ago
Roman Donchenko
bb15e735b8
Merge pull request #1161 from SpecLad:xls-comp-bug
12 years ago
Roman Donchenko
1432f3a82c
Fix xls-report.py not working with more than one comparison.
12 years ago
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
12 years ago
Andrey Pavlenko
aaf47578e8
Merge pull request #1155 from bitwangyaoyao:master_fix
12 years ago
Andrey Pavlenko
f01cd3d99e
Merge pull request #1158 from StevenPuttemans:bugfix_3165
12 years ago
Andrey Pavlenko
cdcb5ed134
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
12 years ago
Andrey Pavlenko
bd4d24f0fa
Merge pull request #1122 from SpecLad:merge-2.4
12 years ago
Andrey Pavlenko
cd103e442f
Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api
12 years ago
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
12 years ago