Roman Donchenko
685eceb68a
Merge pull request #1567 from ilya-lavrenov:warn_fix
2013-10-08 13:50:49 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Roman Donchenko
cca2e5d8b1
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
2013-10-04 16:36:44 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
kdrobnyh
c1de14c27a
Fix bilateralFilter function
2013-08-19 15:52:34 +04:00
Nghia Ho
723bc3cae9
Merge https://github.com/Itseez/opencv
2013-08-13 19:50:43 +10:00
kocheganovvm
086db9d6db
Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison
...
There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.
First contributor of this commit was sperrholz.
2013-08-12 13:51:52 +04:00
StevenPuttemans
1a42dd905c
Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2
2013-08-12 10:04:15 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
Nghia Ho
bc3dd2452f
Added test cpp
2013-07-31 23:59:23 +10:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
2013-07-21 10:39:24 +03:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
Daniel Angelov
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Daniel Angelov
3350533f48
Fixed ambiguouty error, signess compare.
2013-07-13 05:08:15 +03:00
Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
969a7133a9
Implementation of cv::Matx and cv::Vec is almost moved to matx.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Vadim Pisarevsky
944588e732
converted houghlines to C++
2013-02-12 23:16:06 +04:00
Vadim Pisarevsky
05ea571b08
almost finished distance transform conversion (discrete voronoi diagram mode is not ready yet)
2013-02-12 18:56:22 +04:00
Vadim Pisarevsky
9124a76ae7
converted moments function to C++
2013-02-12 18:07:22 +04:00
Vadim Pisarevsky
06f4a56469
converted flood fill, getrectsubpix & cornersubpix to C++
2013-02-11 23:49:10 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Ivan Korolev
9908ff33de
Added regression test for HoughLines algorithm
2013-01-30 11:27:19 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Jason Newton
63debf5032
connectedcomponents test case
2012-12-10 02:21:45 -08:00
Ilya Lavrenov
615e7b2747
added SIMD optimization of Edge-Aware Demosaicing in case of CV_8U
2012-12-10 13:29:08 +04:00
Ilya Lavrenov
07744ccf3d
removed imshow call
2012-12-03 12:30:19 +04:00
Ilya Lavrenov
4116cbe2c0
Merge remote-tracking branch 'upstream/master' into Demosaicing
2012-11-27 12:46:49 +04:00
Ilya Lavrenov
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
78a0b9787c
fixed build errors on Mac; moved test for #2332 from imgproc to highgui
2012-10-15 13:55:32 +04:00
Ilya Lavrenov
2cda65a782
fixed cvtColor (RGB <-> Lab) tests and created another one
2012-10-15 12:22:36 +04:00
Evgeny Talanin
cfe28e3b73
Added test inspired by #2332
2012-10-12 18:43:00 +04:00
Vadim Pisarevsky
925d0cc769
added test for box filter 16u, fixed bug #2416
2012-10-08 14:11:39 +04:00
Ilya Lavrenov
280ecb68bf
changed file path
2012-10-08 13:27:28 +04:00
Ilya Lavrenov
2759f026e9
fixed Bug #2074
2012-10-08 12:59:15 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Ilya Lavrenov
b7b32e74a5
some restructuring of resize algorithm code
2012-09-21 18:17:54 +04:00
Ilya Lavrenov
222303f24b
attempt
2012-09-21 17:25:42 +04:00
Anatoly Baksheev
3b075a50e9
fixed warnings under windows
2012-09-21 13:41:56 +04:00
Ilya Lavrenov
5ab3fe489f
changed resize_area test
2012-09-17 17:38:23 +04:00
Ilya Lavrenov
a65cb5d2de
added extra debug parameters in resize test
2012-09-17 17:08:06 +04:00
Ilya Lavrenov
03daf44848
added recalculating scale coefficients
2012-09-17 16:31:30 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
Ilya Lavrenov
fbd9bfba47
fixed some warnings and errors on windows
2012-09-10 21:37:44 +04:00
Andrey Kamaev
b1b5e392e6
Fix Android build warnings in new imgproc tests
2012-09-10 20:33:35 +04:00
Ilya Lavrenov
dd1091bbe1
a reference function for remap was stabilized
2012-09-10 19:55:03 +04:00
Vadim Pisarevsky
932100c5a3
fixed build errors and warnings on Windows
2012-09-05 17:06:07 +04:00
Ilya Lavrenov
5eac0419b2
changed eps in validate_result function
2012-09-04 22:22:07 +04:00
Ilya Lavrenov
be51e5d1b1
More strict tests for image waring algorithms
2012-09-04 21:52:40 +04:00
Vadim Pisarevsky
9c0f556d88
fixed a few compile warnings and errors with VS2010.
2012-08-03 17:12:45 +04:00
Ilya Lavrenov
27c2aa3a4e
parallel version of bilateral filter was implemented using parallel_for_
2012-08-02 16:25:30 +04:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
2012-06-25 11:24:06 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
47a4e87784
Ignored warnings from gtest with precompiled headers enabled
2012-06-08 14:54:17 +00:00
Marina Kolpakova
83390ea4e1
performance test for INTER_AREA resize has been added.
2012-06-06 14:45:33 +00:00
Marina Kolpakova
8231d0d11d
fixed for resize with INTER AREA. Since now we divide by convolved area
2012-06-06 12:12:21 +00:00
Marina Kolpakova
eabd757def
fixed build
2012-06-06 10:59:10 +00:00
Marina Kolpakova
d192117e86
GPU resize with INTER_AREA
2012-06-06 10:39:42 +00:00
Andrey Kamaev
e309c51430
Fixed phaseCorrelate result for not power of 2 size images #1812 (thanks to Jeff Mast)
2012-05-18 08:33:19 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Kamaev
fd31234122
Fixed gcc build
2012-03-31 23:51:59 +00:00
Andrey Kamaev
470f6fafeb
Fixed conversions from YV12 and IYUV on non-continuous input. Added accuracy and performance tests.
2012-03-31 22:30:18 +00:00
Ivan Korolev
856aaee8cd
Fixed the path to the testdata.
2012-03-30 12:48:47 +00:00
Ivan Korolev
44d4e85d9e
Fixed the path to the testdata.
2012-03-30 12:27:17 +00:00
Vadim Pisarevsky
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
Vadim Pisarevsky
0b234b7a69
rewritten floodfill in generic style; added CV_32S flavor (ticket #1482 )
2012-03-29 17:08:03 +00:00
Vadim Pisarevsky
4eda1662aa
switched back to FitEllipse algorithm by Dr. Daniel Weiss; improved its accuracy in some cases. It fixes #1638
2012-03-29 10:47:08 +00:00
Andrey Kamaev
d6d1ff0ac5
Added regression test for #1652
2012-03-29 03:33:07 +00:00
Andrey Kamaev
700c1665c9
Fixed 2 spontaneously failing tests
2012-03-29 03:05:41 +00:00
Marina Kolpakova
f5152500be
fixed #1373
2012-03-29 01:16:33 +00:00
Marina Kolpakova
dd01861de2
test case from ticket #1650
2012-03-28 20:54:58 +00:00
Andrey Kamaev
09490188b3
#1365 Fixed numerous bugs in Bayer2RGB_VNG_8u SSE optimization, added simple regression test
2012-03-28 20:20:29 +00:00
Vadim Pisarevsky
903c05db1a
added another contour perimeter test and fixed bug #216
2012-03-26 17:00:48 +00:00
Vadim Pisarevsky
befa9b3109
fixed chi-square test, ticket #1263
2012-03-26 09:07:02 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Andrey Kamaev
2f4bb580fc
Fixed some build warnings; slightly improved python search
2012-03-02 08:34:54 +00:00
Alexander Reshetnikov
6ead21b1a2
added licenses to some tests; updated new highgui tests
2012-02-09 10:51:53 +00:00
Alexander Reshetnikov
07fa62f0c4
some design code changes in new tests
2012-01-25 13:41:48 +00:00
Alexander Reshetnikov
cec641fb83
completed test for boundingRect function
2012-01-20 16:21:27 +00:00
Alexander Reshetnikov
b5bbce5b54
Completed countNonZero test (found that it's already exist, so new implementation isn't used now).
2012-01-19 16:30:35 +00:00
Alexander Reshetnikov
a3d2020db0
countNonZero & boundingRect tests - added first versions
2012-01-19 00:22:22 +00:00
Andrey Kamaev
fb2fad52a2
Fixed bug in cv::pyrUp. Reenabled accuracy test.
2011-11-27 11:55:59 +00:00
Vadim Pisarevsky
3dafdd6a79
added 16s support to cv::threshold.
2011-11-22 15:16:45 +00:00
Vadim Pisarevsky
32ed1bf858
added phaseCorrelate function by Will Lucas.
2011-09-05 07:57:18 +00:00
Vadim Pisarevsky
ff5e97c8e4
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
2011-07-19 12:27:07 +00:00
Vadim Pisarevsky
22970b8270
fixed multiple GCC warnings on Ubuntu 11.04
2011-06-14 12:03:34 +00:00
Vadim Pisarevsky
2c1e913b2d
added 16-bit support to Bayer2RGB & Bayer2Gray (ticket #686 ); fixed bug in cv.CreateHist() when no ranges are passed (ticket #990 )
2011-06-03 15:45:50 +00:00
Vadim Pisarevsky
262fc33024
added 16-bit support to Bayer2RGB & Bayer2Gray (ticket #686 )
2011-06-03 14:26:30 +00:00
Vadim Pisarevsky
1a0b1d2aea
improved CV_RGBHSV_FULL accuracy (ticket #938 )
2011-06-02 12:10:18 +00:00
Anatoly Baksheev
1c18e5fef9
fixed ~300 warnings under windows (had to hack gtest a bit)
2011-05-06 21:45:48 +00:00
Vadim Pisarevsky
ae8f2eeac2
restored img_proc_test main() call; removed windows.h from ml.hpp
2011-05-06 11:51:39 +00:00
Vadim Pisarevsky
f39db3f15a
fixed problems indicated with ? marks
2011-05-05 13:31:54 +00:00
Vadim Pisarevsky
9ca45daba3
fixed couple of integral-related bugs
2011-04-29 11:55:33 +00:00
Vadim Pisarevsky
9a991a2e10
fixed build problems on Windows
2011-04-18 15:14:32 +00:00
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
e06557c4a1
temporarily disabled PyramidUp test (it crashes)
2011-02-09 23:20:44 +00:00
Vadim Pisarevsky
d9ab1d2b92
fixed build on Windows with MSVC2010
2011-02-09 22:45:45 +00:00
Vadim Pisarevsky
061b49e0b2
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
2011-02-09 20:55:11 +00:00
