Maksim Shabunin
|
457123027e
|
Modified java wrapping mechanism
|
2015-03-02 18:12:30 +03: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 |
|
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
|
caa2c06e50
|
Quiet output of cv::error in Java tests
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
|
2013-01-23 18:08:09 +04:00 |
|
Andrey Kamaev
|
4668a133f0
|
Java API: fix build warning on OS X
Common part of all source files is extracted to special header
|
2013-01-23 18:08:09 +04:00 |
|