Roman Donchenko
beeb932d22
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +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
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Roman Donchenko
1707b1769f
Merge pull request #1063 from alekcac:conversion
2013-06-28 14:41:35 +04:00
Alexander Shishkov
7b06592dea
added conversions between UIImage and cv::Mat
2013-06-28 13:26:54 +04:00
Alexander Smorkalov
347c86d9b5
Windows RT related code cleanup.
...
Windows RT sample cleanup.
Video I/O code cleanup.
2013-06-26 05:44:10 -07:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Alexander Smorkalov
43122939cb
Media foundation video i/o fixes.
...
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
Alexander Shishkov
0cee15eb7f
Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure.
2013-06-14 15:10:25 +04:00
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
2013-06-10 12:40:30 +04:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Alexander Smorkalov
8606ee4beb
Front/Back camera semantic support added to Android VideoCapture back-end.
2013-04-24 10:56:16 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +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
AoD314
63d9ee9523
This code is based on https://github.com/prasannatsm/opencv code.
...
- added webp (lossy and lossless without alpha channel)
- added tests
2013-03-11 11:51:38 +04:00
Andrey Kamaev
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
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
.
2012-12-03 09:55:53 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Andrey Kamaev
cabddaeb4f
Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed."
...
This reverts commit 36135fc59d
.
2012-10-10 13:24:49 +04:00
Alexander Smorkalov
36135fc59d
Issue #2035 Calling cv::namedWindow crashes on Android fixed.
...
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
2012-10-10 12:40:36 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
2012-10-01 16:23:40 +04:00
Vadim Pisarevsky
bb93651048
added support for bi-level PNG's (patch #2301 ; thanks to Costantino Grana)
2012-09-11 14:05:25 +04:00
Vadim Pisarevsky
e95bc7d502
fixed ios camera timing (patch by Eduard Feicho)
2012-08-22 13:33:13 +04:00
Vadim Pisarevsky
8efb84b5a4
added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232 )
2012-08-20 19:36:36 +04:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
f309bafe9e
another fix for cap_dshow.cpp; fixed warning in facerec_demo
2012-03-30 20:06:06 +00:00
Alexander Reshetnikov
3a564d1ae8
Updated displayOverlay's implementation & documentation (ticket #903 )
2012-03-30 19:58:44 +00:00
Maria Dimashova
550fd8e57c
added image and depth synchronization
2012-03-27 07:41:48 +00:00
Maria Dimashova
baa81de122
renamed property of openni camera
2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a
renamed property of openni camera
2012-03-16 09:08:18 +00:00
Alexander Shishkov
6051e27a09
added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657
2012-03-12 16:07:42 +00:00
Alexander Reshetnikov
b12f18536f
Added new VideoCapture properties for ieee1394 cameras
2012-02-24 10:54:52 +00:00
Vladislav Vinogradov
3afc97e67e
fixed new OpenGL functionality under Qt
2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
bd4239be7b
moved OpenGL wrappers to separate header
...
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
2011-11-30 06:20:29 +00:00
Vladislav Vinogradov
9817252b23
added addTextOpenGl function
2011-11-28 11:50:46 +00:00
Vladislav Vinogradov
6b869f2ec3
minor fix
2011-11-23 10:12:43 +00:00
Vladislav Vinogradov
d7450c2449
added GlArrays class and pointCloudShow function
2011-11-23 10:05:24 +00:00
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
2011-11-21 11:58:52 +00:00
Vadim Pisarevsky
448a252776
added compression strategy as a parameter (another request from ticket #1452 )
2011-10-28 04:11:02 +00:00
Vadim Pisarevsky
df5c60c50a
added missing cv::moveWindow & cv::resizeWindow
2011-08-27 20:05:07 +00:00
Vadim Pisarevsky
c593355e42
fixed declaration of imencode to make it usable in Python etc.
2011-08-26 13:06:43 +00:00
Vadim Pisarevsky
ae83fe7645
added hybrid (feature-based & meanshift-based) tracker (by Pushkar)
2011-08-26 12:22:19 +00:00
Artem Myagkov
8c6782300a
modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial
2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
bd0d8429ee
added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor.
2011-08-11 17:59:30 +00:00
Andrey Morozov
bba4f9e5d6
removed property. added automatically define number of cpus for decoding video
2011-08-02 14:27:21 +00:00
Andrey Morozov
d87a56a639
added support new ffmpeg (0.8.X)
2011-07-29 14:17:42 +00:00
Andrey Kamaev
ac7e16fdf6
Fixed camera output format handling
2011-07-25 12:32:33 +00:00
Vadim Pisarevsky
16ba62dcd5
added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp
2011-07-18 13:05:34 +00:00
Maria Dimashova
b64bb95860
added ability to reset view point of depth generator to normal one ( #1195 )
2011-07-13 17:05:57 +00:00
Ilya Lysenkov
fce7ba4eaf
Added destroyAllWindows and docs (ticket #957 ).
2011-06-20 13:24:48 +00:00
Vadim Pisarevsky
c7a42e9682
started work on API & doc synchronization (in particular, Mat& => Input/OutputArray in the descriptions)
2011-06-07 22:51:31 +00:00
Ethan Rublee
7d4f06b7f3
Attempting to add support for openni depth registration.
2011-06-07 03:19:38 +00:00
Vadim Pisarevsky
a87d12eb9e
added CV_CAP_PROP_PVAPI_MULTICASTIP property (thanks to Stefano Fabri for the patch)
2011-06-06 19:23:43 +00:00
Vadim Pisarevsky
0c877f62e9
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
2011-06-06 14:51:27 +00:00
Andrey Kamaev
3956f54040
Android native camera is updated to support RGBA output
2011-06-06 08:52:51 +00:00
Vadim Pisarevsky
5199cd9c95
removed unnecessary #include "windows.h" from "highgui_c.h"
2011-05-13 19:40:57 +00:00
Leonid Beynenson
7ec77593db
Made changes in Android camera classes: now we can get list of possible preview resolutions of Android camera (as string).
...
Also now work of Android camera is more accurate in the case when the size of grabbed frame buffer does not consist with the expected frame size.
2011-05-10 12:29:43 +00:00
Leonid Beynenson
e262f054ad
Changed algorithm of Android camera synchronisation --- added "auto-grab" mode.
2011-04-29 19:03:41 +00:00
Leonid Beynenson
2806db93d8
Merged the branch /branches/opencv_pthread_framework/opencv into the trunk.
...
The branch contains changes, concerning adding ThreadingFramework -- temporary lightweight decision for ARM instead of Intel TBB.
Also some changes in Android highgui camera class were made.
2011-04-29 14:20:24 +00:00
Nils Hasler
ee0c16e43e
* added property CV_CAP_GSTREAMER_QUEUE_LENGTH
...
* removed unnecessary memcpy
* fixed minor memory leak
2011-04-23 07:27:04 +00:00
Andrey Kamaev
31e77a3bd9
Android native camera: added BGR output format; added methods to configure output frame size.
2011-04-18 08:50:24 +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
Andrey Kamaev
68534d70f3
Merged android-experimental branch back to trunk.
2011-04-06 14:31:03 +00:00
Vadim Pisarevsky
535425982f
extended libdc1394 backend (the patch is by Michael Joachimiak)
2011-04-01 18:29:32 +00:00
Maria Dimashova
ad896ae640
refactored OpenNI integration
2011-02-04 13:41:10 +00:00
Maria Dimashova
152fefe854
minor changes
2011-01-31 08:24:30 +00:00
Maria Dimashova
508aaa41f8
added ability to get and set some Kinect params
2011-01-26 10:38:31 +00:00
Maria Dimashova
3a04d08bf7
added Kinect support (initial version without settings configuration yet) and sample on usage
2011-01-21 17:00:08 +00:00
Vadim Pisarevsky
5b6a755719
almost finished Python wrappers
2010-11-02 17:58:22 +00:00
Vadim Pisarevsky
83f6085773
added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.)
2010-10-27 18:26:39 +00:00
Vadim Pisarevsky
ebb9c61546
fixed bug with Mat::dataend initialization. Now morph-ex test passes; Also fixed CV_Assert() implementation
2010-10-21 21:07:11 +00:00
Vadim Pisarevsky
1b1eab8e67
added helper macros to the function declarations
2010-10-16 20:34:34 +00:00
Yannick Verdie
e65823fac2
Qt sample code and some fixes
2010-08-16 16:49:24 +00:00
Yannick Verdie
e8aad75446
Fixed bugs on Qt
2010-07-31 18:04:28 +00:00
Yannick Verdie
8f8aba9c88
fixed Qt bug
2010-07-30 14:13:20 +00:00
Yannick Verdie
c77e8fc638
Qt - debugging Linux and Windows
2010-07-27 17:29:22 +00:00
Yannick Verdie
f2353b8523
QT new functions:
...
- cvCreateOpenGLCallback: draw 3D on top of the image
2010-07-23 15:22:04 +00:00
Yannick Verdie
ffe7bdf69c
ticket 490:
...
bool not defined ? -> changed everything in int
2010-07-23 12:09:13 +00:00
Yannick Verdie
f572047496
QT new functions:
...
- add CV_RADIOBOX with exclusive mode
2010-07-22 21:46:27 +00:00
Yannick Verdie
2c923c7eba
QT new functions:
...
- cvAddButton changed to match requirement
- CV_GUI_NORMAL and CV_GUI_EXPANDED done
- context menu with right click
2010-07-22 20:39:44 +00:00