Roman Donchenko
85edb9e9b1
Merge pull request #1552 from Exocoder:gtk3
2014-06-04 12:07:17 +04:00
Ehren Metcalfe
cd3aa0184a
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389 )
2014-05-31 19:41:16 -04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vadim Pisarevsky
44acfc38a1
Merge pull request #2739 from StevenPuttemans:bug_1523
2014-05-19 17:33:36 +04:00
StevenPuttemans
12207ac763
fix coordinate problem with large images - bug 1523
2014-05-19 13:07:44 +02:00
Yash Vadalia
7e56cfafbc
fixed a syntax error in cap_giganetix.cpp
...
Ticket 3458 (http://code.opencv.org/issues/3458 )
2014-05-13 19:59:37 +05:30
Luis Zarrabeitia
bb5a22c504
highgui: fix segfault on CvCapture_GStreamer::retrieveFrame
...
CvCapture_GStreamer::retrieveFrame assumes that RGB videos are 24BPP.
This is not necesarily the case, unless we explicitly tell GStreamer
that we want 24BPP RGB streams.
Adding bpp=(int)24 to the appsink caps.
2014-05-11 19:00:14 -04:00
Alexander Alekhin
787815fd00
Merge pull request #2619 from GregoryMorse:patch-3
2014-05-05 18:00:40 +04:00
Roman Donchenko
47d903d968
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2014-04-28 12:08:21 +04:00
Adrian Stratulat
4fb5680d91
Documentation - minor fix-ups
2014-04-23 17:30:27 +00:00
Artur Wieczorek
f27a886314
Fix for issue #3645 ( http://code.opencv.org/issues/3645 ).
...
Implement missing features in CvCaptureCAM_VFW class.
Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.
2014-04-21 17:10:58 +02:00
GregoryMorse
aa3c36f545
Update cap_msmf.cpp
...
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Update cap_msmf.cpp
Successful test - samples are grabbed
Update ppltasks_winrt.h
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
Support VS 2013 and consistency cleanup and C++/CX object creation fixed
2014-04-15 18:32:23 +08:00
Tony
65f63421fa
Change quotes around GTK headers for angle brackets
...
The linux buildbots have started to fail compilation due to not
finding the gtk headers. The quotes have been changed to angle brackets
to indicate to the compiler that these are system includes.
2014-04-13 11:07:38 +01:00
Tony
1638341270
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three
...
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.
The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
modified: cmake/templates/cvconfig.h.in
modified: modules/highgui/src/window.cpp
modified: modules/highgui/src/window_gtk.cpp
2014-04-13 11:04:56 +01:00
Tony
34984328fd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
CMakeLists.txt
2014-04-10 08:07:02 +01:00
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
2014-04-09 13:08:51 +04:00
David Rolland
cb8ddb1179
Corrected bug #1437 . Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.)
...
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx .
2014-04-09 18:24:21 +12:00
Tony
3cd50739ef
Merge remote-tracking branch 'upstream/master'
2014-04-08 19:14:05 +01:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Tony
572e4f5255
Merge remote-tracking branch 'upstream/master'
2014-04-06 11:49:23 +01:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Tony
41b8ab086b
Merge remote-tracking branch 'upstream/master'
2014-03-27 19:32:05 +00:00
Nicolas Gryman
da34f1d58c
added jpeg with optimized coding support.
2014-03-27 13:34:33 -04:00
Roman Donchenko
d67b450741
Merge pull request #2378 from ngryman:progressive_jpeg
2014-03-26 12:12:02 +04:00
Tony
46ba9d30b9
Merge remote-tracking branch 'upstream/master'
2014-03-25 20:44:06 +00:00
Nicolas Gryman
b211e1d989
added jpeg progressive support.
2014-03-25 15:27:24 -04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Roman Donchenko
8af175b81b
Merge pull request #2521 from atrebbi:#3620
2014-03-24 18:54:00 +04:00
Roman Donchenko
9aa6528fd7
Merge pull request #2504 from asmorkalov:android_camera_locks_24
2014-03-24 12:06:51 +04:00
Alessandro Trebbi
c4a63f6a86
-
2014-03-23 22:00:16 +01:00
Ilya Lavrenov
20b6191842
doc fix
2014-03-23 16:20:00 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Roman Donchenko
b70332d806
Merge pull request #1986 from GregoryMorse:patch-3
2014-03-18 16:18:33 +04:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Roman Donchenko
70e22b682d
Merge pull request #2397 from vbystricky:intelperc
2014-03-07 18:19:00 +04:00
vbystricky
193e97a34a
Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual
2014-03-07 16:25:15 +04:00
vbystricky
d4a1df85be
Change text of copyright
2014-03-05 13:06:36 +04:00
vbystricky
f9e942f9ef
Change text of license and copyright
2014-03-05 11:03:57 +04:00
Dave Hughes
b184d7f27b
Fix for #3554
...
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
2014-03-05 02:44:40 +00:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
GregoryMorse
90920c2376
Update cap_msmf.cpp
...
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Update cap_msmf.cpp
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update cap_msmf.cpp
Create cap_msmf.h
Update cap_msmf.cpp
Update cap_msmf.h
Update cap_msmf.cpp
Update cap_msmf.h
Update and rename cap_msmf.h to cap_msmf.hpp
Update cap_msmf.cpp
Update CMakeLists.txt
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.cpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Successful test - samples are grabbed
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update cap_msmf.hpp
Create ppltasks_winrt.h
Update cap_msmf.hpp
Update cap_msmf.hpp
Update cap_msmf.cpp
Update ppltasks_winrt.h
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Update ppltasks_winrt.h
Fixed trailing whitespace
2014-03-04 01:52:17 +08:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Roman Donchenko
48432502b6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
vbystricky
ff8b8ef24c
Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera
2014-02-25 10:59:35 +04:00
Alexander Smorkalov
dbb7aa7856
Highgui_Tiff.decode_tile16384x16384 disabled for Android.
...
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
2014-02-25 10:36:20 +04:00
Matti Picus
dc50dc7254
fix merge
2014-02-21 13:54:58 +02:00
Matti Picus
f5330a44e8
merge with origin
2014-02-21 11:59:49 +02:00
Matti Picus
31c8f2ec57
fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling
2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073
add test (needs updated opencv_extra repo)
2014-02-20 22:10:22 +02:00
Roman Donchenko
ccbceb56c4
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
2014-02-19 14:48:57 +04:00
Alexander Shishkov
77df5948e7
removed trailing spaces
2014-02-18 13:56:26 +04:00
Alexander Shishkov
cc529d971b
removed tabs
2014-02-17 17:37:02 +04:00
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Marijan Vukcevich
9a98cd6e65
Update cap_ios_abstract_camera.mm
...
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
2014-02-17 13:23:25 +04:00
Stuart Cunningham
5d43d3ca88
Fix Windows build of grfmt_tiff.cpp by using libtiff's integer types.
2014-02-12 23:41:38 +11:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Alexander Smorkalov
87935f3560
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
2014-01-31 12:49:10 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Matti Picus
64fd54ffb4
fix tiled read for reading tiles into partial blocks in image
2014-01-24 13:03:47 +02:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Roman Donchenko
087371c021
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
2014-01-20 14:15:05 +04:00
Anatoly Baksheev
5ea3ecdc3b
horisontal mwhell support
2014-01-19 18:32:22 +04:00
Anatoly Baksheev
0fc4ac4f1f
warnings and compilation with installed Windows 8.1 SDK
2014-01-19 04:07:17 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Adi Shavit
8fd0fd538d
Doc fix.
2014-01-16 16:30:54 +02:00
Adi Shavit
46f06d82c9
Update docs.
2014-01-16 12:51:14 +02:00
Adi Shavit
8802d62cc5
Updated docs.
2014-01-16 11:25:57 +02:00
Nick D'Ademo
75b80e5d7d
Added missing comma in enum.
2014-01-16 20:17:49 +11:00
Adi Shavit
24333569aa
Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()
2014-01-16 11:09:25 +02:00
Adi Shavit
e45cf2173f
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.
2014-01-14 21:33:32 +02:00
Adi Shavit
fecd5c994b
Added support for mouse-wheel events on Windows.
...
To be used in the mouse callback like this:
if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
{
int delta= CV_GET_WHEEL_DELTA(event);
// use delta...
}
2014-01-14 21:20:05 +02:00
Adi Shavit
9dc0bfc755
Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors.
...
This is the way recommended by Microsoft.
2014-01-14 21:20:04 +02:00
Nick D'Ademo
25870fa66b
Added PVAPI enums to highgui.hpp
...
Added "PVAPI_" prefix to FrameStartTriggerMode definition
2014-01-14 21:38:57 +11:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Nick D'Ademo
3cf5c0b991
Added get and set for extra PVAPI property: CV_CAP_PROP_FRAMESTARTTRIGGERMODE
2014-01-13 22:01:09 +11:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Roman Donchenko
795c108f2b
Fixed MinGW build by declaring the minimal required Windows version.
...
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
2013-12-30 18:13:42 +04:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +04:00
Andrey Pavlenko
f9aa148ba9
eliminating VS2013 build warnings
2013-12-26 13:35:59 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Vladimir Bystricky
d6a7e8f84f
Remove TBB ifdef form code
2013-12-20 12:33:39 +04:00
Vladimir Bystricky
80d0593dbd
Delete end comma in enumerations
2013-12-18 11:46:52 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
Roman Donchenko
90c28d254f
Merge pull request #1961 from SpecLad:merge-2.4
2013-12-10 14:39:35 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Anatoly Baksheev
f62ffa2aea
compilation
2013-12-07 18:58:29 +04:00
Josep Bosch
2153453fd1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
2013-12-04 22:32:20 +01:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
2013-11-29 23:08:20 +04:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
1b0297d92b
Added fixes mentioned in bugreport 3306
...
- Added author provided fixes
- Added code example
- Added documentation fixes
2013-11-25 09:35:23 +01:00
Roman Donchenko
b8f5fcf3f9
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
2013-11-21 12:03:02 +04:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
2013-11-20 16:08:53 +04:00
Roman Donchenko
b197ec9413
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
2013-11-20 13:36:37 +04:00
Philippe FOUBERT
78e16a906b
Back to the previous coding way (using the macro with the goto).
2013-11-19 21:51:47 +01:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Roman Donchenko
bb4bf7a1f9
Merge pull request #1811 from Nerei:fixed_some_build_errors
2013-11-18 18:09:44 +04:00
Anatoly Baksheev
d8600d3d13
fixed all Viz warnings
...
moved some headers to precomp.hpp
2013-11-17 14:13:11 +04:00
Anatoly Baksheev
5c6248005a
fixed warnings
2013-11-17 14:08:57 +04:00
Anatoly Baksheev
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
Roman Donchenko
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
2013-11-14 17:25:46 +04:00
Roman Donchenko
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
2013-11-13 17:00:20 +04:00
Roman Donchenko
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
2013-11-13 15:52:42 +04:00
Roman Donchenko
b8e3d3f791
In the image sequence capture, only search for the ordinal in the file name.
...
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
2013-11-12 16:26:21 +04:00
Philippe FOUBERT
93120775cd
Using four spaces for indentation.
2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531
Replaced the image used in the Highgui_Video.ffmpeg_image test.
...
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.
When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
2013-11-11 18:30:04 +04:00
Roman Donchenko
eff53e95f9
Fixed the "image sequence" capture not failing when a pattern isn't found.
...
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
2013-11-11 18:12:49 +04:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Philippe FOUBERT
05d9375759
Trailing whitespace removal.
2013-11-11 10:26:28 +01:00
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
2013-11-10 17:46:59 +01:00
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b
Added proper testing of the end of quicktime video files.
...
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
2013-11-06 13:32:11 -08:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
Roman Donchenko
d6a7a6d503
VideoCapture: copy the captured frame, to avoid dangling Mats
...
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.
Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
2013-10-29 18:47:08 +04:00
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
2013-10-25 16:08:14 +04:00
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
)
2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
)
Conflicts:
modules/highgui/test/test_ffmpeg.cpp
2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
)
2013-10-25 14:29:37 +04:00
Roman Donchenko
dfe07df87b
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
2013-10-24 14:09:08 +04:00
Roman Donchenko
424a7b0ab0
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
This should actually remove the need for the workaround from
the previous commit.
2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26
Removed some dubious FFmpeg hack that no longer works.
2013-10-23 14:56:37 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Roman Donchenko
83b36dcbcf
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
2013-10-18 18:39:08 +04:00
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
2013-10-17 20:58:33 +04:00
Tony
5368f12b33
Rework gtk3 window resize and draw cleanup
...
The gtk3 resize functions fail to shrink the window after it has been
resized. This edit changes this and allows the window to be shrunk
back to its original size.
This edit also cleans up the draw/expose functions.
2013-10-15 21:49:20 +01:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Tony
d4df373999
Code cleanup
...
Remove redundent #if defs from code
2013-10-09 20:50:35 +01:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Roman Donchenko
dfb698dc64
Merge pull request #1581 from SpecLad:merge-2.4
2013-10-09 12:33:50 +04:00
Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
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
801054d611
Merge pull request #1566 from SpecLad:Wshadow-openni
2013-10-07 15:48:40 +04:00
Roman Donchenko
744f4b1609
Merge pull request #1565 from SpecLad:cmake-new-ptr
2013-10-04 18:14:34 +04:00
Roman Donchenko
3cfad385ec
Fix a -Wshadow warning in cap_openni.cpp.
2013-10-04 14:23:06 +04:00
Roman Donchenko
32630dbf61
Adapt cap_openni.cpp to the new Ptr.
2013-10-04 13:51:58 +04:00
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
2013-10-03 12:04:57 +04:00
Tony
81d6842b8e
These changes introduce Gtk3 support into the highgui module.
...
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).
window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.
To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
2013-10-02 21:16:40 +01:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
2013-10-01 12:09:17 +04:00
Tony
0d06b1dced
Change true for TRUE
...
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
2013-09-30 21:04:43 +01:00
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
Tony
97fc1e10a7
Replace obsolete Gtk symbols
...
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.
The following symbols have been replaced in this commit:
Gtk symbols that have been moved to the Gdk library:
- GtkType -> Gtype
- GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
- gtk_signal_connect -> g_signal_connect
- GTK_SIGNAL_FUNC -> G_CALLBACK
- gtk_type_class -> g_type_class_peek
- gtk_type_new-> g_object_new
- GtkTypeInfo -> GtypeInfo (Not required for
g_type_register_static_simple)
- gtk_type_unique -> g_type_register_static_simple
- gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
NB: This requires porting to use cairo contexts and GdkPixbufs.
The following gtk symbols are changed for their modern equivalent:
- GTK_WIDGET_REALIZED -> gtk_widget_get_realized
- GTK_OBJECT_FLAGS -> gtk_widget_set_realized
Symbols without replacement:
- gtk_range_set_update_policy -> No replacement; as default policy is
set to continuous we can delete this line.
2013-09-26 18:31:44 +01:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Alexander Smorkalov
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
2013-09-26 12:16:02 +04:00
Alexander Smorkalov
6057414a93
Merge pull request #1199 from devernay:2.4-qtkit
2013-09-24 15:36:16 +04:00
StevenPuttemans
1b1fb131b3
Attempt at fixing bug 3186
2013-09-23 16:51:02 +02:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Alexander Smorkalov
06a7a1ac47
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.
...
QVector range check exception fixed.
2013-09-16 13:42:15 +04:00
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
ad52dd37a9
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
...
This reverts commit 41b8479d03
, reversing
changes made to 531471b0aa
.
Reason: breaks the build.
2013-09-12 12:58:10 +04:00
Roman Donchenko
41b8479d03
Merge pull request #1376 from StevenPuttemans:bugfix_3186
2013-09-09 18:33:11 +04:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Roman Donchenko
beeb932d22
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
Roman Donchenko
fd3b2326b4
Merge pull request #1373 from abidrahmank:pykeypoints
2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Alexander Shishkov
e354fa3fd1
fixed test data in highgui test for HDR
2013-09-03 14:24:14 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
StevenPuttemans
e7921c3fe7
Added changes suggested by bug #3186 : fixing the unplugging of webcam
2013-08-30 13:16:18 +02:00
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
2013-08-30 11:11:06 +05:30
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +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
525b6eca2e
Merge pull request #1311 from leszekhanusz:png_palette_alpha
2013-08-26 16:59:45 +04:00
Fedor Morozov
e2e604eb18
HDR writing bug fix
2013-08-22 21:13:50 +04:00
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
2013-08-22 18:17:19 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +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
Hanusz Leszek
32635a6834
using unsigned char instead of uint8_t to compile under windows
2013-08-21 12:33:51 +02:00
Hanusz Leszek
cf39ba5801
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
...
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
2013-08-21 05:31:44 +02: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
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
2013-08-16 14:05:39 +04:00
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
2013-08-16 12:52:48 +04:00
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
2013-08-15 06:42:00 -07:00
kamjagin
69287c936b
missed # in if defined
2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926
added HAVE_QTKIT to tests
2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
abidrahmank
92d04d439e
docs changes
2013-08-13 21:58:49 +05:30
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
2013-08-12 14:33:30 +04:00
WonderRico
d067749c21
fix _index / index
2013-08-12 11:19:53 +02:00
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
2013-08-12 09:49:19 +02:00
WonderRico
a048387376
fix formating
2013-08-09 16:13:40 +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
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
2013-08-08 12:03:41 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Fedor Morozov
bef8d8192e
Minor fixes, new MergeDebevec
2013-08-06 15:24:01 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Fedor Morozov
17609b90c7
Mantiuk's tonemapping
2013-08-05 19:22:42 +04:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Fedor Morozov
302bf23f82
All hdr functions as Algorithms
2013-08-01 03:24:47 +04:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72
Added bugfix #2795
...
- changing license header
- fixed bug in QtKit when changing camera resolution
2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
abidrahmank
fa1b96bd36
imshow docs improvement bug#2490
2013-07-30 07:00:51 +05:30
Frédéric Devernay
6be8757e8b
fix signedness error
...
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c
fix cap_qtkit.mm for multithreaded applications
...
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.
Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
2013-07-26 18:39:03 +02:00
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
2013-07-26 16:13:37 +04:00
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
2013-07-22 18:38:57 +04:00
Fedor Morozov
703cf8cef7
Calibration, various changes
2013-07-21 13:48:57 +04:00
Philippe FOUBERT
9c04db554f
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
2013-07-20 15:03:30 +02:00
Fedor Morozov
ec668ce3a7
Documentation
2013-07-19 00:23:49 +04:00
Alexander Shishkov
a29ce401d5
minore changes in test on HDR fromat
2013-07-18 01:32:06 +04:00
Alexander Shishkov
8ccca90dca
small changes
...
added including for precomp
2013-07-18 00:28:40 +04:00
Vadim Pisarevsky
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
2013-07-16 15:02:33 +04:00
Roman Donchenko
feaa12a274
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
Roman Donchenko
1590a1a538
Merge pull request #1068 from AoD314:webp2
2013-07-15 11:45:28 +04:00
andrey.morozov
e4e0862c2e
added support image with alpha channel
2013-07-13 14:09:37 +04:00
Nikita Manovich
05aeb70831
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Roman Donchenko
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
2013-07-11 12:40:16 +04:00
Roman Donchenko
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
2013-07-10 19:45:56 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Nikita Manovich
21211308d0
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-10 17:48:44 +04:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Alexander Smorkalov
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
Andrew Senin
aa2ca3aa8f
Improve FPS on black and white Ximea cameras
2013-07-09 00:33:39 +04:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
andrey.morozov
8d0452ed59
added test to save image with webp with alpha channel
2013-07-06 17:26:22 +04:00
Fedor Morozov
a5e11079d7
Fixes, missing files, tests
2013-07-04 16:51:39 +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
Philippe FOUBERT
639450efdc
PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4)
2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1
allow QtKit capture in secondary threads
...
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
2013-07-02 18:08:12 +02:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Roman Donchenko
4b51b1e3a8
Merge pull request #1059 from dominikrose:dc1394_2-1394b
2013-06-28 14:47:45 +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
Kirill Kornyakov
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
Dominik Rose
d39aeeca0f
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f
dc1394-2: support for operation mode 1394b added
2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223
Merge pull request #1040 from asmorkalov:winrt
2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804
Test fixes
...
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
2013-06-27 15:47:37 +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
34c6598752
Perf test failure fixes for Media Foundation.
2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c
GetProperty method for MSMF VideoCapture implemented.
2013-06-25 03:35:56 -07: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
abidrahmank
bcf9117957
Added missing python functions in highgui documentation
...
setMouseCallback
createTrackbar
2013-06-24 15:53:45 +05:30
Alexander Smorkalov
996f02a531
Multiple Media Foundation video i/o fixes.
...
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083
Media Foundation-based code refactoring.
...
I* + SafeRelease -> ComPtr.
2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee
Media Foundation camera capture fixed.
...
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec
VideoCapture for video files implemented.
...
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2
Media Foundation-based VideoWriter improvements.
...
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e
Media Foundation-based VideoWriter added
2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3
Media Foundation based VideoCapture improved
...
Code formating fixed;
GrabFrame method implemented correclty.
2013-06-24 02:45:21 -07:00
Fedor Morozov
84ea0c9a97
Tests and rgbe fix
2013-06-24 05:54:58 +04:00
Fedor Morozov
7469c935f3
HDR formats support and HDR making. Code only.
2013-06-23 14:19:09 +04:00
Vladislav Vinogradov
af2fc1a22a
added documentation for OpenGL interoperability
2013-06-20 16:11:10 +04:00
Roman Donchenko
37d19b9c46
Pass the HAVE_QT* flags through the config header, like all others.
...
I don't know why it didn't work for the original author, but it definitely
works now.
2013-06-19 17:44:12 +04:00
Roman Donchenko
1d9660c6d2
Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
2013-06-19 17:01:57 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
5b39c02c39
Merge pull request #1007 from alekcac:i_camera
2013-06-18 15:54:01 +04:00
Alexander Shishkov
24fd2cc326
updated licenses
2013-06-18 07:02:09 +04:00
Alexander Shishkov
5db08961ce
fixed Kirill's comments
2013-06-18 06:59:52 +04:00
Roman Donchenko
4bc4f4aa1f
Merge pull request #1003 from vhdirk:gstreamerfixes
2013-06-14 15:51:03 +04:00
Roman Donchenko
0124902f42
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows
2013-06-14 15:46:25 +04: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
Alexander Smorkalov
37b67fa50d
Fix compiler error due to missing pthread header (Issue #2953 )
2013-06-13 16:11:39 +04:00
Dirk Van Haerenborgh
30f7f9717f
allow for arbitraty number of sources and sinks
2013-06-13 11:16:33 +02:00
Dirk Van Haerenborgh
6d66d11046
gstreamer: cleaning up resources
2013-06-12 16:58:16 +02:00
Andrew Senin
8eb6decb25
Fixed Ximea cameras support
2013-06-11 21:17:31 +04:00
Roman Donchenko
3af21cad4c
Merge pull request #903 from aks2:2.4
2013-06-11 17:35:39 +04:00
Roman Donchenko
7c4e3715b3
Merge pull request #975 from SpecLad:merge-2.4
2013-06-11 17:28:26 +04:00
Roman Donchenko
3bfc69740b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Merged pull requests:
#890 from caorong:patch-1
#893 from jet47:gpu-arm-fixes
#933 from pengx17:2.4_macfix_cont
#935 from pengx17:2.4_filter2d_fix
#936 from bitwangyaoyao:2.4_perf
#937 from bitwangyaoyao:2.4_fixPyrLK
#938 from pengx17:2.4_surf_sample
#939 from pengx17:2.4_getDevice
#940 from SpecLad:autolock
#941 from apavlenko:signed_char
#946 from bitwangyaoyao:2.4_samples2
#947 from jet47:fix-gpu-arm-build
#948 from jet47:cuda-5.5-support
#952 from SpecLad:jepg
#953 from jet47:fix-bug-3069
#955 from SpecLad:symlink
#957 from pengx17:2.4_fix_corner_detector
#959 from SpecLad:qt4-build
#960 from SpecLad:extra-modules
Conflicts:
modules/core/include/opencv2/core/core.hpp
modules/gpu/CMakeLists.txt
modules/gpu/include/opencv2/gpu/device/vec_math.hpp
modules/gpu/perf/perf_video.cpp
modules/gpuimgproc/src/cuda/hough.cu
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/pyrlk.cpp
samples/gpu/driver_api_multi.cpp
samples/gpu/driver_api_stereo_multi.cpp
samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Alexander Smorkalov
956d8027ef
Bug #3044 cap_dshow.cpp forgotten validity check fixed.
2013-06-10 13:29:45 -07:00
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
2013-06-10 12:40:30 +04:00
Leszek Swirski
7d0f6b4d68
Fix image saving from QT toolbar
2013-06-06 11:15:00 +01:00
Leszek Swirski
9a1cc06ebe
Fix pixel value rendering for non-fixed-size QT windows
2013-06-06 11:14:52 +01:00
Roman Donchenko
8714cbac91
Fix a missing header path when building with Qt 4.
...
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
2013-06-06 14:09:33 +04:00
IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
2013-06-05 21:59:01 -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
alex77git
c8abaea368
(tab to space) 2x
2013-05-20 12:06:25 +02:00
alex77git
bc59428b3a
Bug #2966 , insert CV_Assert(size.width>0 && size.height>0); in imshow()
2013-05-20 02:28:40 +02:00
Dominik Rose
86ec9b79fd
libd1394 2.x support for mingw on windows added
2013-05-14 16:30:12 +02:00
Vadim Pisarevsky
2a646f7626
Merge pull request #862 from piponazo:v4lFPS
2013-05-14 16:00:28 +04:00
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +04:00
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
2013-05-13 21:18:47 +04:00
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Luis Díaz Más
d13d5c0c12
Added setting feature of FPS in cap_libv4l
2013-05-01 01:07:03 +02:00
Andrey Pavlenko
5ce4e3c265
Merge pull request #800 from asmorkalov:android_cam_idx_semantic
2013-04-29 10:00:08 +04:00
Alexander Smorkalov
8606ee4beb
Front/Back camera semantic support added to Android VideoCapture back-end.
2013-04-24 10:56:16 +04:00
Kevin Hughes
eedb6fa3c4
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
2013-04-17 13:20:32 -04:00
Andrey Kamaev
8b294c6c90
Remove documentation for old python wrapper
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Andrey Kamaev
0c64fc61dc
Merge pull request #740 from evil0sheep:2.4
2013-04-11 11:33:31 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
befd696720
Update documentation
2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Vladislav Vinogradov
bf6c08a9ea
fixed compilation with CUDA
2013-04-08 13:29:04 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
eb3c9ed1ab
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0
...
Based on pull request #685
2013-04-04 11:27:43 +04:00
Andrey Kamaev
1e9ed14205
Merge pull request #752 from khzimmer:2.4
2013-04-04 00:57:33 +04:00
Karl-Heinz Zimmer
2122627877
Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras.
2013-04-03 17:54:29 +02:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
2013-04-03 04:14:40 -07:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
dave
8db1a73102
Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC
2013-04-02 10:31:02 -07:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +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
addf0309ec
Move cv::Size_
2013-04-01 15:24:32 +04:00
Vladislav Vinogradov
3c86788b1f
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
2013-04-01 11:35:33 +04:00
Alexander Smorkalov
c6cab50c5c
Perf tests for Video IO on WInRT fixed.
2013-03-28 00:15:30 -07:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
2013-03-27 00:45:41 -07:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Kamaev
6377922716
Fix build with gstreamer 0.10.28
2013-03-26 13:10:09 +04:00
Andrey Kamaev
a3e31a69df
Merge pull request #684 from vhdirk:gstreamer-1.x
2013-03-25 17:01:43 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +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
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
3088808926
Fix build of various backends
2013-03-22 22:14:40 +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
Dirk Van Haerenborgh
921675c4e2
eliminated warnings
2013-03-21 16:11:53 +01:00
Alexander Smorkalov
7ec2b6bad0
Highgui tests for GUI disabled for WinRT;
...
Warnings fix;
2013-03-21 16:18:19 +04:00
Andrey Kamaev
2d764fe1c6
Merge pull request #665 from taka-no-me:core_utility
2013-03-21 14:47:49 +04:00
Dirk Van Haerenborgh
4f3453dbbf
bomb commit of gstreamer videocapture and videowriter
2013-03-21 10:22:56 +01:00
Alexander Smorkalov
429cd85b46
More accurate guards for WinRT features in CMake.
2013-03-20 12:21:29 -07:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Alexander Smorkalov
3d594c70ff
Multiple Windows RT fixes
...
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
2013-03-19 17:46:01 -07:00
AoD314
7d0c600504
improved test of webp
2013-03-19 18:04:15 +04:00
Andrey Kamaev
14d27112e9
Fix build of ffmpeg wrapper with some versions of avutil
2013-03-14 14:52:13 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Alexander Smorkalov
06aff4e7b0
Initial Windows RT support commit.
...
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
2013-03-13 09:02:15 -07: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
Andrey Kamaev
7e50d3e571
Fixed MSVC warnings
2013-03-13 11:34:04 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
Andrey Kamaev
fb76095378
Merge pull request #610 from AoD314:webp2
2013-03-11 21:13:36 +04:00
AoD314
9680176fa9
added docs
2013-03-11 15:47:21 +04:00
AoD314
eb012a5993
added tests for WebP
2013-03-11 11:51:46 +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
Charles Otto
c02f94392b
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
...
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
2013-03-04 22:14:52 -05:00
Charles Otto
52137ceed0
Allow encoding with libx264 via ffmpeg to work
...
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
2013-03-04 19:29:05 -05:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
Andrey Kamaev
c5e979ceb7
Merge pull request #581 from vpisarev:ios_fix
2013-02-28 01:58:13 +04:00
Vadim Pisarevsky
11ba220e02
fixed iOS framework compile errors after recent changes
2013-02-28 00:54:01 +04:00
Andrey Kamaev
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +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
gferry
e3803f9985
fix for OpenCV issue #2815
...
- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values
2013-02-21 17:37:24 +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
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
37e2664cf0
Merge pull request #479 from ilya-lavrenov:TestHighGUI
2013-02-14 11:21:01 +04:00
kobigurk
18a5b8dfc6
fixed tab indent
2013-02-13 14:21:34 +02:00
kobigurk
88e0127f44
API of TiffDecoder back to what it was - normalizeChannelsNumber moved to protected
...
test code unified - channels number is tested for other formats as well
2013-02-13 14:13:36 +02:00
kobigurk
109e047a28
* img_test is now tested for channel numbers instead of img
...
* fixed indentation to use spaces and trailing spaces
2013-02-13 13:33:07 +02:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
ac389507a0
Fix warnings from ffmpeg wrapper
2013-02-12 19:58:59 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Ilya Lavrenov
5512f91d08
removed libstdc++ dependency
2013-02-12 14:20:23 +04:00
kobigurk
9f80c6c989
added test for 4 channel tiff
2013-02-12 11:21:51 +02:00
Andrey Kamaev
5cae645ba1
Temporary disabled parallel_writers_and_readers test
2013-02-11 16:52:20 +04:00
Andrey Kamaev
2ed6bc8aaf
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
...
This reverts commit 4abf0b3193
.
Changes are reverted because they break build of proxy dlls on Windows
2013-02-11 14:15:29 +04:00
kobigurk
7927ebf20e
alpha channels support for 8-bit tiffs
2013-02-10 01:22:49 +02:00
Andrey Kamaev
bf575ba7fb
Merge pull request #434 from taka-no-me:fix_parallel_writer_test
2013-02-06 14:04:59 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
727b6a7259
Merge pull request #408 from asmorkalov:giganetix_cams_patch
2013-02-04 14:56:54 +04:00
Andrey Kamaev
3c39e146a3
Make parallel video writer test pass if compiled without threading support
2013-02-04 14:34:44 +04:00
Andrey Kamaev
0cd8684ade
Fix setting of FPS after frame width and height with DShow cameras
...
Issue #2114
2013-02-01 18:01:13 +04:00
Alexander Smorkalov
75191e8f2f
Smartek Giganetix Cameras support (Patch #2192 ) integrated to master.
2013-02-01 16:54:00 +04:00
Alexander Smorkalov
25086ed257
Smartek Giganetix Cameras support (Patch #2192 ) integrated.
2013-02-01 16:07:32 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Andrey Kamaev
13d2412d24
Merge pull request #394 from taka-no-me:fix_tiff_test
2013-01-31 20:52:35 +04:00
Andrey Kamaev
55b90d7bae
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test
2013-01-31 18:51:24 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Andrey Kamaev
2d6253609c
Fix truncation of fourcc value in dshow capture property setter (bug #2535 )
...
Added test checking that all valid fourcc values are converted properly
2013-01-31 12:00:04 +04:00
Andrey Kamaev
9b4f2d1b53
Merge pull request #373 from ilysenkov:bugfix_2440
2013-01-30 19:37:16 +04:00
Andrey Kamaev
33c26a93c6
Merge pull request #376 from taka-no-me:solve_tiff_conflict
2013-01-30 19:36:09 +04:00
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Andrey Kamaev
11871528ce
Solve conflict between tiff.h and opencv2/core/types_c.h
...
Сonflict exists between some versions of libtiff and opencv headers
2013-01-30 16:36:50 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +04:00
Ilya Lysenkov
56fbcc541f
Tested cvDestroyAllWindows() without windows
2013-01-30 15:25:10 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
81f5e72630
Merge pull request #366 from asmorkalov:gstreamer_codec_list
2013-01-30 14:41:22 +04:00
Andrey Kamaev
ae7460440e
Merge pull request #361 from taka-no-me:tiff_big_tile
2013-01-30 14:40:51 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Alexander Smorkalov
82e325cbfa
Patch #2721 More FourCC for gstreamer applied.
2013-01-30 11:44:14 +04:00
Andrey Kamaev
62ce815197
Fix rollover when computing buffer size in tiff decoder (bug #2161 )
2013-01-30 00:07:33 +04:00
Andrey Kamaev
b4d0dff4c5
Added minimal support for tiff encoder parameters and test for issue #2161
2013-01-30 00:07:30 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
0b1fe53a46
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657 )
2013-01-29 17:09:23 +04:00
Andrey Kamaev
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +04:00
Andrey Kamaev
da884b4e1d
Merge pull request #347 from asmorkalov:WITH_FFMPEG_logic
2013-01-29 14:00:10 +04:00
Alexander Smorkalov
8c45b9d03d
Video IO perf tests guarded.
2013-01-29 11:09:49 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
681ffd9a21
NetBSD video(4) support, patch 2 of 3
...
* Decouple Video4Linux2 support from Video4Linux as existence of
v4l2 on a system does not imply support for v4l.
* Don't use V4L's struct video_window in V4L2 code.
* Removed __USE_GNU as comment says:
/* support for MJPEG is only available with libjpeg and gcc,
because it's use libjepg and fmemopen()
so replace with test for fmemopen() if found necessary.
2013-01-28 17:11:41 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
255cd61a8c
Improve error reporting of JPEG image encoder
...
OpenCV issue #2604
After this patch applied an attempt to encode empty images produces exception
saying "Raw image encoder error: Empty JPEG image (DNL not supported)"
2013-01-28 16:55:00 +04:00
Andy Maloney
e87355463f
{highgui} Fix copy-paste error in conditional
2013-01-26 16:38:01 -05:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Kamaev
4e1ba6f02f
Fix build with libjpeg release 9
2013-01-08 19:55:29 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Éric Piel
7701fa7a63
highgui: fix segfault on CvCapture_GStreamer::open
...
when compiled with GStreamer, open (of a file) segfaults.
Fix was suggested by Bostjan Vesnicer.
2012-12-15 12:11:13 +01:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Andrey Kamaev
6e244c83cd
Corrected sanity checks in several perf tests
...
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
2012-12-12 01:00:47 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Andrey Kamaev
67ce03d7dd
Merge branch 2.4
2012-12-10 23:51:34 +04:00
Andrey Kamaev
1821d21f5b
Prevent imread from illegal memory access (Bug #2602 )
...
The change is based on pull request #211 .
2012-12-06 19:42:17 +04:00
Vadim Pisarevsky
7852b68c20
Merge pull request #197 from asmorkalov:ffmpeg_status_message_fix
2012-12-04 21:02:10 +04:00
Alexander Smorkalov
6e0db3f527
Feature #1322 "If dll cannot be loaded a warning should be generated" implemented.
2012-12-03 13:52:49 +04:00
Andrey Kamaev
ae5649d3f7
Drop unsupported imageio from grfmt
2012-12-03 09:56:09 +04:00
Andrey Kamaev
00fbf58902
Revert incompletely applied patch from #2192
...
This reverts commit 2e7656dbdf
.
2012-12-03 09:55:53 +04:00
Andrey Kamaev
476efd7d37
Drop unsupported yzx and mil camera backends
2012-12-03 09:28:01 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +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
Alexander Smorkalov
bb3d14e1a0
Patch #2323 "cap_libv4l.cpp clears default width and height after setting them" applied.
2012-11-28 21:53:39 +04:00
Andrey Kamaev
50bebd6f0b
Merge pull request #166 from askforeric:pvapi_updates
2012-11-28 11:31:01 +04:00
askforeric
3923484341
Refactored the PvAPI capture class to better facilitate dynamic property changes
...
- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
but does not fail if this doesn't succeed.
2012-11-28 11:28:16 +04:00
Ilya Lavrenov
4abf0b3193
thread-safe VideoWriter and VideoCapture
2012-11-19 16:44:23 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
Andrey Kamaev
63ee26adda
Merge pull request #127 from cuda-geek/apple2clang
2012-11-02 14:29:39 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
fd4909360f
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
2012-11-01 12:44:10 +04:00
Andrey Kamaev
b5ecb1d32d
Merge pull request #111 from taka-no-me/algorithm/addParam-short
2012-10-31 16:57:06 +04:00
Andrey Kamaev
74fe158f4b
Merge pull request #117 from vpisarev/doc_updates
2012-10-31 16:56:04 +04:00
Andrey Kamaev
3e10e057cb
Merge pull request #110 from vpisarev/test_fixes2
2012-10-31 16:52:50 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
Vadim Pisarevsky
63bd6f9adf
fixed compile errors in ocl tests; disabled a few problematic tests
2012-10-29 23:37:18 +04:00
Andrey Kamaev
ad982f4ed6
Turn off video IO perf tests on Android
2012-10-26 17:00:31 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Andrey Kamaev
22e352d9cc
Merge pull request #76 vpisarev/test_fixes_1
2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
2012-10-22 21:13:26 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +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
Kirill Kornyakov
aedf56404e
made imread description slightly better #2406
2012-10-15 15:23:38 +04:00
Vadim Pisarevsky
5b2271c6fb
another fix for #2332 test
2012-10-15 14:12:32 +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
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +04:00
Vsevolod Glumov
b91ca6a73f
Removed the phrase, that was causing all the confusion. Issue #2406 .
...
+ Some minor formatting fixes.
2012-10-12 14:15:30 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Andrey Kamaev
f41ab3a330
Merge pull request #34 from roynos/master
2012-10-11 16:31:20 +04:00
Evgeny Talanin
bd4620f04e
#2408 patch apply (see pull request at https://github.com/Itseez/opencv/pull/33 )
2012-10-11 14:38:25 +04:00
Vadim Pisarevsky
63c9412922
enable huge value range in highgui sliders on Windows (patch #941 )
2012-10-10 23:05:15 +04:00
Andrey Kamaev
354b77e2e1
Applied fix from bug #2324 : ocv_list_unique makes for incorrect linking
2012-10-10 19:40:55 +04:00
Andrey Kamaev
d6a8753124
Remove second argument from VideoCapture_Reading perf test
2012-10-10 19:40:19 +04:00
Vadim Pisarevsky
0e314163e5
fixed INT64_C & UINT64_C definitions (patch #2033 )
2012-10-10 17:27:32 +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
89de0bebd8
Merge remote-tracking branch 'origin/master'
2012-10-09 21:52:56 +04:00
Vadim Pisarevsky
3243ad3483
applied patch #1473 (timestamp retrieval in OpenNI)
2012-10-09 21:52:41 +04:00
Andrey Kamaev
8ebd04cbf9
Fix sanity checks in highgui module
2012-10-09 19:39:03 +04:00
Roy Reapor
5d9d4659ad
Fixed issue 2404
...
- imdecode_() only creates a temporary file when needed.
- Use the string's empty() function to flag if the temporary file needs
to be deleted.
2012-10-03 23:06:59 -07: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
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
2012-10-01 16:23:40 +04:00
Vadim Pisarevsky
420dd22258
fixed a few warnings reported by Oleg; restored SSE2 optimization in FAST
2012-10-01 14:12:19 +04:00
marina.kolpakova
dc568d4de1
fix for 4-channels TIFF missing 'break' statement
2012-10-01 08:33:56 +04:00
Vadim Pisarevsky
40d5b026c7
fixed verbose mode in highgui's DirectShow wrapper (bug #2350 )
2012-09-19 16:57:10 +04:00
Vadim Pisarevsky
4e07561141
fixed possible compile error in cap_ffmpeg_impl.hpp (bug #2365 )
2012-09-19 16:48:19 +04:00
Vadim Pisarevsky
58fb8692c3
added test for png encoding bug #2352
2012-09-17 16:44:40 +04:00
Vadim Pisarevsky
d9e801fbfa
improved image rendering performance in Qt backend for highgui UI (bug #2356 )
2012-09-17 16:13:53 +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
Andrey Kamaev
f268af8ef0
Removed remaining SWIG marks from headers
2012-09-07 22:19:43 +04:00
Alexander Smorkalov
710e070990
Native camera issue on HTC One S fixed.
...
Camera connect->disconnect->connect leads to sigsegv.
Apply properties method reimplemented.
2012-09-07 17:22:47 +04:00
Andrey Kamaev
bcd0aefbca
Fix gcc build errors and warnings
2012-09-05 15:51:51 +04:00
Andrey Kamaev
577d9cdece
Fix openexr build on MinGW
2012-09-02 20:44:09 +04:00
Andrey Kamaev
941391c0be
Fix openexr build with MSVC
2012-09-02 20:44:07 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
Vadim Pisarevsky
2367a195c5
probably fixed compile error on MacOSX 10.6
2012-08-31 14:35:11 +04:00
Sergiu Dotenco
85eae7b30d
win32: always link to vfw32
2012-08-30 14:52:39 +02:00
Vadim Pisarevsky
a6e2acbfee
added a few missing images for tutorials; integrated pull request #26
2012-08-30 16:23:18 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
7744b1d600
Android camera: fix logging macro part 2
2012-08-28 15:07:42 +04:00
Vadim Pisarevsky
e2c9e7c3fb
applied patches from #2311
2012-08-28 14:19:34 +04:00
Andrey Kamaev
71df8906be
Android camera: commented logs in frame callback
2012-08-24 16:10:17 +04:00
Andrey Kamaev
ad35f317f6
Fix buffer allocation in Android camera
2012-08-24 16:10:17 +04:00
Vadim Pisarevsky
e95bc7d502
fixed ios camera timing (patch by Eduard Feicho)
2012-08-22 13:33:13 +04:00
Vadim Pisarevsky
0d2b8f4ba1
fixed the channel ordering of rgba images (by Eduard)
2012-08-21 15:41:05 +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
d525362cd5
Fixed 2 new Android build warnings
2012-08-13 19:24:31 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Sam Bromley
8506ce06c1
Fix missing remainder of line.
2012-07-26 12:46:51 -02:30
Sam Bromley
966a652142
Fix crash when polling for non-existent Kinects.
...
If no Kinects are present, crash can result from
stepping beyond end of device list. Now we check
to ensure this does not happen.
2012-07-26 12:36:21 -02:30
Maria Dimashova
469ec7c522
fixed vfw ( #2156 )
2012-07-11 09:04:25 +00:00
Maria Dimashova
bc3fb347a3
fixed #2155
2012-07-11 08:41:09 +00:00
Marina Kolpakova
d88bbb3d9d
fixed undefined behaviour in image codecs initialization
2012-07-08 18:26:28 +00:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
df262b340c
Fixed #2125
2012-07-02 14:20:59 +00:00
Vadim Pisarevsky
7ef2114107
added fullscreen mode on Mac (patch #2040 by Takahiro Horikawa)
2012-07-01 20:25:24 +00:00
Andrey Kamaev
27c23b557c
Merged few small fixes from 2.4 branch
2012-06-30 13:36:27 +00:00
Andrey Kamaev
4d09d62f85
Added Ptr<T> support to AlgorithmInfo; fixed some warnings
2012-06-29 07:46:53 +00:00
Vadim Pisarevsky
82cb2ab556
fixed bug in SVD, ticket #2027 ; fixed building highgui with ffmpeg support on MacOSX
2012-06-28 19:45:13 +00:00
Vadim Pisarevsky
7c778fc043
fixed possible video distortion problem when cap_avfoundation.mm is used to capture video (ticket #1980 )
2012-06-28 16:34:53 +00:00
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
Andrey Kamaev
69b5972e03
Fixed MSVC build with Qt enabled #2096
2012-06-26 21:05:15 +00:00
Andrey Kamaev
55567582a6
added XIMEA support for linux (by Igor Kuzmin) #2085
2012-06-26 11:48:58 +00:00
Andrey Kamaev
f9418853a0
Applied XIMEA path (by Marian Zajko) with multiple changes #2054
2012-06-26 11:47:49 +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
5e0160d711
Fixed few warnings on Linux
2012-06-21 12:44:48 +00:00
Andrey Kamaev
25f70e691a
Fixed warnigs from zlib defines
2012-06-21 10:28:57 +00:00