254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
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
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
96c1df14f4
CLAHE Python bindings
2013-08-13 19:51:32 +05:30
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
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
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
7b87d72d80
refactored generalized hough (both CPU and GPU):
...
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
694d9ff2eb
LSD enum now anonymous.
2013-07-15 23:28:19 +03:00
d35601209e
Added define guard for ln10. Fixed some warnings.
2013-07-14 14:29:56 +03:00
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
6bd5e12be3
Added a sample to show usage of the class.
2013-07-13 04:11:27 +03:00
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
5350a2f1d9
Added Line Segmen Detector.
2013-07-13 00:21:02 +03:00
37f4e400e4
Added cv2.boxPoints() functionality to Python bindings (Feature #2023 )
...
http://www.code.opencv.org/issues/2023
eg:
In [3]: box = ((10,10),(5,5),0)
In [4]: cv2.boxPoints(box)
Out[4]:
array([[ 7.5, 12.5],
[ 7.5, 7.5],
[ 12.5, 7.5],
[ 12.5, 12.5]], dtype=float32)
2013-06-24 12:13:59 +05:30
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
e153f0631c
Added missing enums for cvtColor RGB to YUV420p
2013-03-18 10:33:44 +04:00
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
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
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
7255ede3af
Added implementation for RGB to YUV420p color conversion
2013-02-24 23:07:05 +04:00
4cb25e9584
update documentation to latest connected components interface
2012-12-19 14:55:46 -08:00
1eae455acb
fixed build warnings from VS; hopefully, fixes Android build too
2012-12-15 23:14:50 +04:00
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
e70b3ef598
use a ltype parameter to determine result Label image type; export stats with differening types over different outputarrays
2012-12-08 23:09:14 -08:00
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
5225672dc0
added edge-aware demosaicing and bayer to bgra conversion
2012-11-26 16:17:43 +04:00
d5aa679d3f
adjust output type to return int32... it should at least be unsigned but this breaks python bindings;
...
remove non-8bit input type support, not worth the binary size
2012-11-22 21:26:52 -08:00
85880397c4
connectedcomponents: use opencv integral types, add to docs, fix up things for a python export
2012-11-05 12:02:53 -08:00
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
ed51162568
Fix binary compatibility of Java wrappers
2012-10-17 02:09:37 +04:00
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
2012-10-16 19:37:12 +04:00
64b56d7018
Revert "remaining C-style planar subdivisions data structures are moved to legacy"
...
This reverts commit 4aaaef5967
2012-10-16 15:13:00 +04:00
58f31819cc
Return drawContours back to imgproc
...
This partly reverts commit 6ca618277c
2012-10-15 18:12:33 +04:00
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
98c92f196e
added Generalized Hough implementation
2012-09-10 16:49:40 +04:00
a72f4474b4
fixing bug #1987(android keeps RGBA in alpha pre-multiplied form, Mat <-> Bitmap should handle this correctly)
2012-06-29 15:38:10 +00:00
Roman Donchenko