StevenPuttemans
e7921c3fe7
Added changes suggested by bug #3186 : fixing the unplugging of webcam
2013-08-30 13:16:18 +02:00
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
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
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
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
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
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
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
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02: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
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +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
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
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
Fedor Morozov
ec668ce3a7
Documentation
2013-07-19 00:23:49 +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
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
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
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
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
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
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
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
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
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
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
2013-05-13 21:18:47 +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 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
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
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
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -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
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
Dirk Van Haerenborgh
4f3453dbbf
bomb commit of gstreamer videocapture and videowriter
2013-03-21 10:22:56 +01: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
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
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
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
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
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
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
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
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
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
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
Ivan Korolev
eaa5012163
fix v4l yes-yes build
2013-01-30 17:04:33 +04:00
Ilya Lysenkov
3c8787980c
Fixed cvDestroyAllWindows() without windows in QT ( #2440 )
2013-01-30 15:26:49 +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
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
287fb2c611
Fix build warning
2013-01-29 14:52:03 +04:00
Andrey Kamaev
0734d9b877
Merge branch '2.4'
2013-01-29 14:16:07 +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
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
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
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
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +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
Evgeny Talanin
5dd1ec98f7
#720 patch apply
2012-10-12 14:25:36 +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
Vadim Pisarevsky
0e314163e5
fixed INT64_C & UINT64_C definitions (patch #2033 )
2012-10-10 17:27:32 +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
3243ad3483
applied patch #1473 (timestamp retrieval in OpenNI)
2012-10-09 21:52:41 +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
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
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
Vadim Pisarevsky
2367a195c5
probably fixed compile error on MacOSX 10.6
2012-08-31 14:35:11 +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
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
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
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
f9418853a0
Applied XIMEA path (by Marian Zajko) with multiple changes #2054
2012-06-26 11:47:49 +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
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
16c94d643f
Fixed #2053
2012-06-15 06:40:20 +00:00
Marina Kolpakova
f273e54be3
fixed part of shadow warnings
2012-06-13 13:21:51 +00:00
Andrey Kamaev
7cccc93bdf
Fixed Android build warnings and few warnings in specific cnfigurations
2012-06-13 13:19:43 +00:00
Maria Dimashova
f363c835ab
fixed compilation error and some warnings if with_openni is true
2012-06-13 08:38:30 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Marina Kolpakova
09d4d69100
minor warning fixes
2012-06-09 15:24:36 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
677680d82d
reverted the original VideoCapture::read() code; moved frame index check to where it should belong: ffmpeg wrapper; applied patch by Rob Reilink (ticket #1971 )
2012-06-01 08:55:16 +00:00
Andrey Kamaev
c492dc6a83
Fixed property names in cap_dshow #1993
2012-05-29 05:41:46 +00:00
Andrey Kamaev
e161f428a0
Fixed PvAPI search on Windows #1927
2012-05-24 20:10:13 +00:00
Alexander Mordvintsev
8429c109be
FIX: VideoCapture::read() was returning empty image for camera captures
2012-05-22 07:58:31 +00:00
Andrey Kamaev
c9027fecc0
Fixed few MinGW build problems
2012-05-20 18:45:19 +00:00
Andrey Kamaev
9961658eab
Fixing compile on some MinGW platforms
2012-05-19 10:44:43 +00:00
Andrey Kamaev
def87eae19
Fixed MinGW build after r8358
2012-05-17 20:19:48 +00:00
Vadim Pisarevsky
00c30681bc
Added Snap-to-Screen Edge feature in the case of multiple monitors (patch by Adi Shavit)
2012-05-16 16:13:24 +00:00
Vadim Pisarevsky
f620f1ce57
fixed building avfoundation on MacOSX with iOS targets
2012-05-15 15:34:53 +00:00
Alexander Reshetnikov
57e26bde9f
Accelerating the completion of video bypass (bug #1893 )
2012-05-05 17:28:05 +00:00
Alexander Reshetnikov
3ec43a11ed
Fixed read error in VideoCapture for images (bug #1892 ); minor fix of ffmpeg wrapper warning
2012-05-05 14:43:03 +00:00
Andrey Kamaev
3a1f85d4e8
Remerged the 2.4.0 branch
2012-05-02 20:20:14 +00:00
Vladislav Vinogradov
ca57239618
fixed some problems after r8280 (lost code)
2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
f4b4665940
added VideoReader_GPU
2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
70909738f4
added support of different surface formats to VideoWriter_GPU
...
added key frame handling to ffmpeg wrappers
2012-04-17 11:08:08 +00:00
Vladislav Vinogradov
2bfaf540a1
added VideoWriter_GPU
2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexander Shishkov
9bfd50e6ae
merged revisions r7802,r7804,r7805 from 2.4 branch
2012-04-03 00:33:33 +00:00
Alexander Reshetnikov
1c616f43ba
Fixed compilation error with ffmpeg 0.9.x & 0.10.x
2012-03-31 17:06:35 +00:00
Alexander Reshetnikov
4ec2ad91b9
Removed duplicated includes from ffmpeg wrappers
2012-03-31 15:27:48 +00:00
Alexander Reshetnikov
958d5a0caa
Solved a problem with VideoWriter in the new wrapper
2012-03-31 15:12:45 +00:00
Alexander Reshetnikov
ab0fc84781
Fixed compilation error under Ubuntu 11.10; added #if-#else-#endif code for some deprecated functions
2012-03-31 15:10:13 +00:00
Vadim Pisarevsky
1e5a600d13
fixed video capturing on Mac running Windows (ticket #988 )
2012-03-31 08:56:48 +00:00
Vadim Pisarevsky
f309bafe9e
another fix for cap_dshow.cpp; fixed warning in facerec_demo
2012-03-30 20:06:06 +00:00
Alexander Reshetnikov
3a564d1ae8
Updated displayOverlay's implementation & documentation (ticket #903 )
2012-03-30 19:58:44 +00:00
Andrey Kamaev
7a017973bf
Fixed Windows build (MSVC 10 Win32)
...
internal CV_CAP_PROP_ZOOM is renamed to CV_CAP_PROP_ZOOM_DSHOW
internal CV_CAP_PROP_FOCUS is renamed to CV_CAP_PROP_FOCUS_DSHOW
2012-03-30 19:26:15 +00:00
Vadim Pisarevsky
f0b8b81caa
applied big patch #1281 by Martin Beckett (various direct show video capture enhancements)
2012-03-30 18:39:03 +00:00
Alexander Reshetnikov
aff34adf1b
Updated new ffmpeg wrapper
2012-03-30 16:57:41 +00:00
Alexander Reshetnikov
e00f1e3911
Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400 )
2012-03-30 14:30:24 +00:00
Vadim Pisarevsky
38f686252c
added video stream positioning in QTKit-based VideoCapture backend (patch #1420 )
2012-03-30 14:13:21 +00:00
Alexander Reshetnikov
554e0051e8
Fixed error with color space switching for IEEE1394 cameras (patch #766 )
2012-03-29 16:15:55 +00:00
Alexander Shishkov
0ac70e6883
fixed #1421
2012-03-29 13:46:54 +00:00
Alexander Reshetnikov
1564fe9a83
Fixed segfault problem with cap_unicap (ticket #1112 )
2012-03-29 12:20:06 +00:00
Alexander Reshetnikov
ee8c4aeb4b
Updated close method for ieee1394 cameras
2012-03-29 11:56:53 +00:00
Andrey Kamaev
d46f44b48a
#1695 fixed arrow key events with the Qt backend
2012-03-28 22:22:02 +00:00
Alexander Reshetnikov
2a68228b66
changed icvSetVideoSize function (ticket #1067 )
2012-03-28 16:14:36 +00:00
Andrey Kamaev
9941cf7c95
Fixed MSCV2005 build with TBB enabled.
2012-03-27 23:17:53 +00:00
Vadim Pisarevsky
8513ed08d0
probably fixed multi-threaded capturing from DShow cameras (ticket #1470 )
2012-03-27 12:50:56 +00:00
Maria Dimashova
f70d171cef
changed default parameter
2012-03-27 08:37:39 +00:00
Maria Dimashova
550fd8e57c
added image and depth synchronization
2012-03-27 07:41:48 +00:00
Alexander Reshetnikov
1d7e09a9d5
Removed duplicated ifdef code from ffmpeg wrappers
2012-03-26 13:51:05 +00:00
Alexander Reshetnikov
1a04d09140
Fixed compilation error for ffmpeg tests
2012-03-26 12:27:00 +00:00
Vladislav Vinogradov
9034a2d6d7
fixed gpu arithm functions (mismatch with cpu version)
2012-03-26 11:02:03 +00:00
Alexander Reshetnikov
c6571249a8
Update FFMPEG wrapper binaries
2012-03-23 10:59:06 +00:00
Alexander Shishkov
84ddd6018d
fixed wrapper compilation on Windows (opencv_ffmpeg dlls)
2012-03-23 10:52:36 +00:00
Alexander Reshetnikov
e83ebde210
Fixed ifdef code mistake
2012-03-22 23:17:04 +00:00
Alexander Reshetnikov
b27d1662e6
Separated ffmpeg codecs and wrappers
2012-03-22 21:28:06 +00:00
Andrey Pavlenko
23619718ed
fixing copy/paste typo
2012-03-22 13:23:11 +00:00
Alexander Reshetnikov
0dd4386d77
Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file
2012-03-21 18:07:34 +00:00
Maria Dimashova
499efec5b0
removed debug log
2012-03-21 14:47:13 +00:00
Maria Dimashova
c1a6cb6221
added oni-files reading
2012-03-21 14:31:40 +00:00
Alexander Reshetnikov
82a2a50f87
Updated new ffmpeg wrapper
2012-03-21 12:54:52 +00:00
Maria Dimashova
fedff0922e
removed unnecessary members of CvCapture_OpenNI
2012-03-21 11:58:25 +00:00
Maria Dimashova
67d7669188
switched to use RunXmlScript always (missing '\n' at the end of xml script was a problem)
2012-03-21 08:56:38 +00:00
Alexander Reshetnikov
5d4a8d0889
Updated license text in highgui files
2012-03-20 16:39:02 +00:00
Alexander Reshetnikov
4dff974e8c
Refactored new ffmpeg wrapper
2012-03-20 09:17:28 +00:00
Alexander Reshetnikov
484fe1d598
Fixed compiling error for ffmpeg with libavcodec less than 53.4.0
2012-03-19 09:05:55 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Maria Dimashova
baa81de122
renamed property of openni camera
2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a
renamed property of openni camera
2012-03-16 09:08:18 +00:00
Alexander Shishkov
7f2ddf16eb
minor changes in wrapper 5
2012-03-15 20:39:11 +00:00
Alexander Shishkov
6546719158
minor changes in wrapper 4
2012-03-15 20:30:21 +00:00
Alexander Shishkov
a12fb7f96c
minor changes in wrapper 3
2012-03-15 20:14:59 +00:00
Maria Dimashova
930c7bf20e
minor refactoring CvCapture_OpenNI
2012-03-15 15:55:07 +00:00
Alexander Shishkov
538eeeab1d
minor changes in wrapper 2
2012-03-15 15:43:14 +00:00
Alexander Shishkov
10b0f29372
minor changes in wrapper
2012-03-15 15:36:14 +00:00
Alexander Shishkov
bf4df828f7
minor changes in wrapper
2012-03-15 15:30:01 +00:00
Alexander Shishkov
7b3ec537b4
minor changes in wrapper
2012-03-15 15:12:52 +00:00
Maria Dimashova
c13febc4d4
minor refactoring CvCapture_OpenNI::CvCapture_OpenNI
2012-03-15 09:59:23 +00:00
Alexander Reshetnikov
36b2ff3cf3
Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows
2012-03-15 09:24:03 +00:00
Alexander Shishkov
0ea66a38ff
fixed compilation FFMPEG wrapper on Windows
2012-03-15 07:22:31 +00:00
Alexander Reshetnikov
e0b772a392
Added a first version of new ffmpeg wrapper
2012-03-12 17:07:54 +00:00
Alexander Shishkov
6051e27a09
added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657
2012-03-12 16:07:42 +00:00
Alexander Shishkov
d05b788db4
fixed compilation problems with MinGW after rev7353
2012-02-28 12:39:25 +00:00
Andrey Kamaev
216d75ccae
Restored missed }
2012-02-24 12:45:23 +00:00
Alexander Reshetnikov
9b5534a6e0
Fixed syntax error in cap_dc1394_v2.cpp
2012-02-24 12:27:20 +00:00
Alexander Reshetnikov
b12f18536f
Added new VideoCapture properties for ieee1394 cameras
2012-02-24 10:54:52 +00:00
Alexander Reshetnikov
8b7edda6ac
Added cvShowImage working with handles under Windows.
2012-02-22 13:30:47 +00:00
Alexander Shishkov
50df95650a
fixed #924
2012-02-22 12:16:01 +00:00
Alexander Shishkov
f7866677eb
fixed #1615
2012-02-22 12:13:56 +00:00
Vladislav Vinogradov
2d30480982
created wrappers for new NPP functions
...
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Andrey Kamaev
e426dfc396
Fixed #1613 : removed YUV420i color conversion constants
2012-02-21 15:08:03 +00:00
Alexander Reshetnikov
f83aa74bc4
Updated ffmpeg implementation (setProperty & getProperty methods)
2012-02-18 12:56:00 +00:00
Vadim Pisarevsky
716a5d04ab
fixed a few problems detected by Xcode 4.2.1
2012-02-15 19:48:04 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Alexander Shishkov
7c03b301c1
fixed #927 issue
2012-02-09 10:53:16 +00:00
Alexander Shishkov
c761996a28
fixed #927 issue
2012-02-08 15:29:07 +00:00
Alexander Shishkov
06247b49af
fixed issue #1243
2012-02-06 08:13:11 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Andrey Morozov
386578bc3f
fixed compile error
2012-02-01 09:54:18 +00:00
Alexander Reshetnikov
a41b0902f4
Prepared some videos for future tests. Added first version of common positioning video test.
2012-01-31 21:02:05 +00:00
Andrey Morozov
196ac49fcf
fixed of the ticket #1442
2012-01-26 11:36:12 +00:00
Vadim Pisarevsky
403a7ff391
fixed memory leak in cap_libv4l.cpp (ticket #1518 ; thanks to gorgen for the patch)
2012-01-26 08:37:24 +00:00
Vladislav Vinogradov
6310622be3
minor
2011-12-13 06:25:37 +00:00
Vladislav Vinogradov
061f032719
fixed build under linux
2011-12-12 13:57:37 +00:00
Vladislav Vinogradov
3afc97e67e
fixed new OpenGL functionality under Qt
2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
1a1d167bb8
fixed build under linux
2011-11-30 06:45:46 +00:00
Vladislav Vinogradov
bd4239be7b
moved OpenGL wrappers to separate header
...
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
2011-11-30 06:20:29 +00:00
Vladislav Vinogradov
0403746636
implemented addTextOpenGl under Gtk
2011-11-28 12:35:05 +00:00
Vladislav Vinogradov
07debd6cb5
minor fix
2011-11-28 12:10:37 +00:00
Vladislav Vinogradov
9817252b23
added addTextOpenGl function
2011-11-28 11:50:46 +00:00
Vladislav Vinogradov
2a4fb155e1
added OpenGL support to Gtk realization of highgui
2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3
fixed build with Qt
2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
d7450c2449
added GlArrays class and pointCloudShow function
2011-11-23 10:05:24 +00:00
Vladislav Vinogradov
4d09737a02
fixed compilation error
2011-11-21 12:28:54 +00:00
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
2011-11-21 11:58:52 +00:00
Vadim Pisarevsky
325e0b1ab8
fixed ffmpeg backend build on Ubuntu 11.10
2011-11-04 16:44:52 +00:00
Vadim Pisarevsky
448a252776
added compression strategy as a parameter (another request from ticket #1452 )
2011-10-28 04:11:02 +00:00
Vadim Pisarevsky
17c3102705
improved png compression ratio (ticket #1452 )
2011-10-28 02:22:11 +00:00
Vadim Pisarevsky
a512883170
fixed bug #1388
2011-09-27 15:23:43 +00:00
Andrey Kamaev
6167469bbd
Fixed fullscreen window mode on Windows.
2011-09-11 18:54:25 +00:00
Vadim Pisarevsky
df5c60c50a
added missing cv::moveWindow & cv::resizeWindow
2011-08-27 20:05:07 +00:00
Artem Myagkov
3a3bc18381
modified capturing building ligic for iOS
2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a
modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial
2011-08-23 11:19:58 +00:00
Andrey Kamaev
014ba699a3
Attempt to fix a build problem (ambiguous PixelType error when compiled on Mac x86)
2011-08-19 19:18:32 +00:00
Vadim Pisarevsky
c66ed3e02f
fixed Ximea constructor call
2011-08-15 14:23:55 +00:00
Vadim Pisarevsky
c65c67eff4
preserve alpha channel in PNG, when imread(..., -1) is called (ticket #1107 )
2011-08-11 22:38:09 +00:00
Vadim Pisarevsky
bd0d8429ee
added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor.
2011-08-11 17:59:30 +00:00
Maria Dimashova
ec150c24e3
added CV_CAP_PROP_OPENNI_REGISTRATION property for getting
2011-08-09 13:58:05 +00:00
Maria Dimashova
1f07209f6c
fixed CvCapture_OpenNI constructor (removed all exceptions) ( #1237 )
2011-08-08 15:47:52 +00:00
Andrey Morozov
bba4f9e5d6
removed property. added automatically define number of cpus for decoding video
2011-08-02 14:27:21 +00:00
Vadim Pisarevsky
ce2f4c6a4d
propagated fix for EXR from 2.3 branch to trunk
2011-08-02 12:55:05 +00:00
Andrey Morozov
d0176d69f2
fixed property for ffmpeg
2011-08-01 16:05:34 +00:00
Andrey Morozov
c697f6a3f8
fixed build ffmpeg v0.8.1
2011-07-31 17:34:31 +00:00
Andrey Morozov
c55a37ad7c
fixed build with ffmpeg 0.5.X
2011-07-30 10:26:37 +00:00
Andrey Morozov
c0a0c881ee
minor fix
2011-07-30 07:52:06 +00:00
Andrey Morozov
418bc6dbe9
minor fix for ffmpeg
2011-07-29 14:37:54 +00:00
Andrey Morozov
d87a56a639
added support new ffmpeg (0.8.X)
2011-07-29 14:17:42 +00:00
Andrey Kamaev
ac7e16fdf6
Fixed camera output format handling
2011-07-25 12:32:33 +00:00
Vadim Pisarevsky
df78bc04d6
converted book samples from ch4; fixed potential alignment problems in QTKit video capturing module
2011-07-23 19:11:17 +00:00
Vadim Pisarevsky
0bf4d9ec2b
fixed Xcode 4.1 compile errors in png codec in highgui
2011-07-21 19:50:20 +00:00
Vadim Pisarevsky
ff5e97c8e4
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
2011-07-19 12:27:07 +00:00
Maria Dimashova
b64bb95860
added ability to reset view point of depth generator to normal one ( #1195 )
2011-07-13 17:05:57 +00:00
Vadim Pisarevsky
eff35f2341
fixed timeScale formula in CvCapture_FFMPEG::setProperty(... CV_CAP_PROP_POS_...) (ticket #1207 )
2011-07-08 15:03:28 +00:00
Vadim Pisarevsky
ddd57e7496
commented off debugging print in cap_libv4l.cpp (ticket #807 )
2011-07-07 22:58:20 +00:00
Vadim Pisarevsky
b33224f0b6
merged the latest fixes in 2.3 to trunk
2011-07-04 16:18:12 +00:00
Vadim Pisarevsky
f8e1e88ce2
we do not need strmiids.lib anymore
2011-07-01 14:03:03 +00:00
Vadim Pisarevsky
6c8a2b8888
propagated fixes in docs and cap_dshow to trunk
2011-07-01 09:39:22 +00:00
hartmut
7f260a0f0b
fix for capture
2011-06-30 14:57:27 +00:00
Vadim Pisarevsky
49467947ac
propagated some fixes from 2.3 to trunk
2011-06-23 12:00:09 +00:00
Ilya Lysenkov
fce7ba4eaf
Added destroyAllWindows and docs (ticket #957 ).
2011-06-20 13:24:48 +00:00
Ilya Lysenkov
233dfd252d
Qt: fixed signal of a clicked push button (patch #786 )
2011-06-20 09:49:21 +00:00
Vadim Pisarevsky
108fc3f4fe
fixed problem with non 4:3 cameras (ticket #142 )
2011-06-19 22:35:24 +00:00
Vadim Pisarevsky
873b72edd9
use original image type (8-bit grayscale or 24-bit RGB) in the case of RAW video (ticket #782 )
2011-06-19 22:23:59 +00:00
Vadim Pisarevsky
ec97683ddf
fixed positioning in ffmpeg wrapper (thanks to mike_at_nrec for the patch). Added frame positioning feature to laplace demo to test the feature
2011-06-19 22:06:32 +00:00
Ilya Lysenkov
77be493e45
Qt: fixed keyPressEvent (ticket #803 )
2011-06-17 09:26:53 +00:00
Andrey Kamaev
206aa50f86
Added Android native camera module
2011-06-16 18:00:41 +00:00
Ilya Lysenkov
480f8235a7
Qt: fixed destroyAllWindow crash (patch #794 )
2011-06-16 15:48:01 +00:00
Ilya Lysenkov
0565a9456d
Qt: fixed using of OpenCV in another Qt app (patch #919 )
2011-06-16 13:20:50 +00:00
Ilya Lysenkov
4f3fb040a4
Qt: fixed resizing of maximized window (patch #858 ).
2011-06-16 12:44:04 +00:00
Vadim Pisarevsky
17b18de531
added missing evcode.h; made videoinput optional (ticket #1142 )
2011-06-16 09:51:34 +00:00
Andrey Morozov
802fcc57a2
fixed "bitrate tolerance too small for bitrate"
2011-06-16 08:31:08 +00:00
Vadim Pisarevsky
412e7a835f
videoInput is now integrated into highgui and built from sources
2011-06-15 22:59:41 +00:00
Ilya Lysenkov
f0cc8d3085
QT: fixed exceptions (ticket #901 )
2011-06-15 13:26:40 +00:00
Ilya Lysenkov
96503991b1
Fixed wheel zoom with QT (ticket #733 )
2011-06-15 09:27:38 +00:00
Vadim Pisarevsky
22970b8270
fixed multiple GCC warnings on Ubuntu 11.04
2011-06-14 12:03:34 +00:00
Alexander Shishkov
cfe633c6f9
applied patch from ticket #801
2011-06-13 22:40:17 +00:00
Vadim Pisarevsky
23d211bfed
applied patches from #1005
2011-06-13 22:04:28 +00:00
Andrey Kamaev
9484355137
Reduced logs count in Android camera
2011-06-09 12:04:10 +00:00
Maria Dimashova
8f4f982e5c
added support of several kinects ( #1105 )
2011-06-09 11:22:48 +00:00
Maria Dimashova
c6e49402a5
changed temporary filename and aligned RGB data with XYZ data ( #867 )
2011-06-09 10:34:13 +00:00
Stefano Fabri
11feada567
Some warning fix. Initial multicast get property support
2011-06-09 07:54:10 +00:00
Maria Dimashova
4a1ccbeee6
optimized retrievePointCloudMap ( #1106 )
2011-06-08 13:06:29 +00:00
Stefano Fabri
715b5d0c55
Little fix for multicast (we'll testing in a real multicast environment in the next days)
2011-06-08 12:44:01 +00:00
Ethan Rublee
7d4f06b7f3
Attempting to add support for openni depth registration.
2011-06-07 03:19:38 +00:00
Vadim Pisarevsky
a87d12eb9e
added CV_CAP_PROP_PVAPI_MULTICASTIP property (thanks to Stefano Fabri for the patch)
2011-06-06 19:23:43 +00:00
Vadim Pisarevsky
0c877f62e9
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
2011-06-06 14:51:27 +00:00
Andrey Kamaev
3956f54040
Android native camera is updated to support RGBA output
2011-06-06 08:52:51 +00:00
Ilya Lysenkov
b884c3c40c
Removed direct tiff writing to in-memory buffers if libtiff is used
2011-06-02 15:16:35 +00:00
Ilya Lysenkov
02cd916ce1
Added reading of floating point tiff data: 32- and 64-bit (ticket #955 )
2011-06-02 12:35:52 +00:00
Alexander Shishkov
8b43e90e7f
fixed ticket #675
2011-06-02 09:51:25 +00:00
Ilya Lysenkov
8e93fcbe87
Added writing of compressed tiffs using libtiff library (patch #1080 , thanks to Pieter-Jan Busschaert)
2011-06-02 09:06:00 +00:00
Vadim Pisarevsky
24dcfa1a4f
removed confusing CvCapture::queryFrame(); rewritten cvQueryFrame() (ticket #235 )
2011-05-29 21:02:53 +00:00
Vadim Pisarevsky
b58d9edc6a
return NULL in the case of incorrect camera index (ticket #710 )
2011-05-21 18:07:28 +00:00
Andrey Kamaev
1388826c41
Tegra optimization for calcOpticalFlowPyrLK
2011-05-20 14:33:41 +00:00
Andrey Kamaev
613a69abe8
Tegra optimization for yuv420i to rgb conversion
2011-05-19 06:36:44 +00:00
Vadim Pisarevsky
2dc981aaa8
fixed bug with possible memory corruption in CvMat m = iarray.getMat(); expressions (ticket #1054 )
2011-05-18 15:16:12 +00:00
Andrey Kamaev
16712bad93
minor bugfix
2011-05-16 15:10:44 +00:00
Andrey Kamaev
0293912ea4
Parallel version of YUV->RGB conversion for Android camera
2011-05-16 14:14:06 +00:00
Vadim Pisarevsky
fa2f1c036a
removed "#include "windows.h"" from core headers
2011-05-13 20:00:58 +00:00
Vadim Pisarevsky
5199cd9c95
removed unnecessary #include "windows.h" from "highgui_c.h"
2011-05-13 19:40:57 +00:00
Vadim Pisarevsky
138b9724d8
make ubuntu 11.04 compile with libv4l
2011-05-12 11:40:42 +00:00
Leonid Beynenson
7ec77593db
Made changes in Android camera classes: now we can get list of possible preview resolutions of Android camera (as string).
...
Also now work of Android camera is more accurate in the case when the size of grabbed frame buffer does not consist with the expected frame size.
2011-05-10 12:29:43 +00:00
Nils Hasler
39b79b1261
change state of pipeline to NULL before freeing.
2011-05-06 19:06:33 +00:00
Vadim Pisarevsky
23a9b7bb9c
fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920
2011-04-30 19:29:26 +00:00
Leonid Beynenson
e262f054ad
Changed algorithm of Android camera synchronisation --- added "auto-grab" mode.
2011-04-29 19:03:41 +00:00
Leonid Beynenson
2806db93d8
Merged the branch /branches/opencv_pthread_framework/opencv into the trunk.
...
The branch contains changes, concerning adding ThreadingFramework -- temporary lightweight decision for ARM instead of Intel TBB.
Also some changes in Android highgui camera class were made.
2011-04-29 14:20:24 +00:00
Vadim Pisarevsky
3d92d4c0bc
fixed compile errors on Ubuntu 11.04
2011-04-28 14:08:03 +00:00
Vadim Pisarevsky
caa943c85f
made png codec in highgui compatible with libpng-1.5 (thanks to wiz for the patch)
2011-04-26 12:41:42 +00:00
Vladislav Vinogradov
dad986a6cb
added 16-bit support to TiffEncoder (restore after #4919 )
2011-04-25 10:46:06 +00:00
Nils Hasler
3b9138c4a0
fixed jump over initialisation bug.
2011-04-25 09:04:15 +00:00
Nils Hasler
91d813bc89
If a pipeline is specified manually, this has to be done in full now, ending with appsink. For example:
...
"uridecodebin uri=file:///path/to/some/video.avi ! ffmpegcolorspace ! appsink"
2011-04-24 09:48:19 +00:00
Nils Hasler
80da1d408b
removed private copy of gstappsink because appsink is now part of gstreamer base.
2011-04-23 21:24:41 +00:00
Maria Dimashova
e7e72d24d3
fixed compile error (ubuntu64)
2011-04-23 13:09:56 +00:00
Nils Hasler
ee0c16e43e
* added property CV_CAP_GSTREAMER_QUEUE_LENGTH
...
* removed unnecessary memcpy
* fixed minor memory leak
2011-04-23 07:27:04 +00:00
Alexey Kazakov
e9aa6fa012
Added ROC-curve calculating to the cascade detection algorithm
2011-04-22 10:03:05 +00:00
Vladislav Vinogradov
604c53a0ab
added 16-bit support to TiffEncoder
2011-04-21 08:16:23 +00:00
Andrey Kamaev
31e77a3bd9
Android native camera: added BGR output format; added methods to configure output frame size.
2011-04-18 08:50:24 +00:00
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
2011-04-17 13:14:45 +00:00
Nils Hasler
56b206dc7b
When opening a file with GStreamer:
...
* if the filename looks like a URI, it is opened in non-blocking mode, cvQueryFrame() could skip frames or grab one frame more than once
* if the filename looks like a filename, it is opened in blocking mode. cvQueryFrame() grabs consecutive frames
* otherwise the filename is interpreted as a gstreamer pipeline as used with gst-launch. The last element of the pipeline has to have the property name=to-opencv
2011-04-13 07:15:35 +00:00
Andrey Kamaev
b906ad3108
Test system included into Android build
2011-04-11 14:47:06 +00:00
Andrey Kamaev
68534d70f3
Merged android-experimental branch back to trunk.
2011-04-06 14:31:03 +00:00
Vadim Pisarevsky
535425982f
extended libdc1394 backend (the patch is by Michael Joachimiak)
2011-04-01 18:29:32 +00:00
Maria Dimashova
cbdc91889a
fixed setProperty
2011-03-25 10:37:32 +00:00
Maria Dimashova
63c9b4cec1
fixed mirror property of kinect
2011-02-17 15:53:20 +00:00
Maria Dimashova
ad896ae640
refactored OpenNI integration
2011-02-04 13:41:10 +00:00
Maria Dimashova
152fefe854
minor changes
2011-01-31 08:24:30 +00:00
Maria Dimashova
d70d2edc9f
changed returned value of unsupported property
2011-01-27 07:33:34 +00:00
Maria Dimashova
508aaa41f8
added ability to get and set some Kinect params
2011-01-26 10:38:31 +00:00
Maria Dimashova
68ed806be0
replaced own point cloud computing by OpenNI ConvertProjectiveToRealWorld()
2011-01-24 17:09:45 +00:00
Maria Dimashova
3a04d08bf7
added Kinect support (initial version without settings configuration yet) and sample on usage
2011-01-21 17:00:08 +00:00
Vladimir Dudnik
6309b2d08d
added OpenCVFindIPP.cmake script, which will look for IPP installation at CMake configuration time. First, IPPROOT environment variable will be tested, if not found script will look at default install places.
...
The script should support IPP from 5.3 up to 7.x versions (although tested on Windows for IPP 6.1 and IPP 7.0 versions only)
Preliminary optimization of HOG with IPP added too. Not yet quite efficient, code for cpu branch should be redesigned in order to have better performance.
2010-12-31 16:45:18 +00:00
Vadim Pisarevsky
e90f197beb
merged fix for x64 MSVC compile errors in highgui into trunk
2010-12-27 12:01:38 +00:00
Vadim Pisarevsky
8b48eebeee
enable #include "cvconfig.h" in highgui on Windows. That should fix camera capture.
2010-12-20 21:20:46 +00:00
Vadim Pisarevsky
4339f69da4
fix opencv-highgui build with old versions of libpng (< 1.4.x)
2010-12-11 18:05:50 +00:00
Vadim Pisarevsky
3beac049d5
replicated the fix for Ptr<CvCapture> bug
2010-12-08 09:36:42 +00:00
Vadim Pisarevsky
3e7fbd21e0
fixed compile errors in cap_qt.cpp (ticket #391 )
2010-12-04 17:58:45 +00:00
Vadim Pisarevsky
11ed55ddb4
fixed mouse painting in Qt bindings (to make watershed & inpaint demos work); increased the font in the detailed pixel image display.
2010-12-04 15:15:06 +00:00
Vadim Pisarevsky
1286c1db45
fixed multiple warnings from VS2010.
2010-11-25 16:55:46 +00:00
Vadim Pisarevsky
334ac49d34
added user mode selection (thanks to tito for the patch, ticket #563 )
2010-11-24 22:54:52 +00:00
Vadim Pisarevsky
beee6f2f70
pass the correct rgb->gray coefficients to PNG decoder, to match cvtColor's.
2010-11-24 19:50:52 +00:00
Vadim Pisarevsky
636cb15f3d
add protection against EAGAIN error in the streams (thanks to vrabaud for the patch - ticket #553 )
2010-11-22 13:07:43 +00:00
Vadim Pisarevsky
3163cfb845
added 16-bit tiff support, enabled LZW codec in tiff (tickets #588 , #590 )
2010-11-21 21:50:45 +00:00
Vadim Pisarevsky
feb0de80e1
avoid use of writable global variables in V4L capturing module (thanks to fjmadrid for the patch! - see the ticket #384 )
2010-11-21 13:09:37 +00:00
Vadim Pisarevsky
5b6a755719
almost finished Python wrappers
2010-11-02 17:58:22 +00:00
Ethan Rublee
9ee954a0c6
Made calibration a bit faster in the absense of a checkboard and trying to fix
...
a crash with the libv4l capture code
2010-11-01 06:20:36 +00:00
Stefano Fabri
ed0ce7ed50
Fixed missing semicolon
2010-10-25 11:29:08 +00:00
Yannick Verdie
54ba887432
Qt fix: cvAddText ticket #561
2010-09-16 17:52:10 +00:00
Yannick Verdie
24427d593f
Qt add byte per line information to fix a bug
2010-08-24 16:18:32 +00:00
Yannick Verdie
411e16074e
Qt Ticket #520
2010-08-24 12:23:37 +00:00
Yannick Verdie
69e6294854
Qt ticket #537
...
Forgot to update so code after previous fix
2010-08-20 13:06:14 +00:00
Yannick Verdie
3e8a8f7942
Qt weird bug with QLabel (is it really fixed ?)
2010-08-19 22:59:32 +00:00
Yannick Verdie
45daaa6e11
Qt bug with buttons
2010-08-19 10:36:57 +00:00
Yannick Verdie
48090fd37e
Qt bug fixed #534
2010-08-18 18:56:22 +00:00
Yannick Verdie
3746c48451
Bug in calibration.cpp sample
...
This was crashing my code:
for( size_t i = 1; i < imagePoints.size(); i++ )
objectPoints.push_back(objectPoints[0]);
Changed by:
objectPoints.resize(imagePoints.size(),objectPoints[0]);
Plus clean up on Qt code
2010-08-18 15:35:56 +00:00
Yannick Verdie
8ada1da08c
2010-08-18 14:45:38 +00:00
Yannick Verdie
94b588099c
Qt test (some code disabled for debugging)
2010-08-18 14:07:02 +00:00
Yannick Verdie
a3582b4780
Qt Python binding -- #512
2010-08-18 11:02:11 +00:00
Yannick Verdie
b530a2cba9
Qt ticket #531
2010-08-17 17:22:21 +00:00
Yannick Verdie
662c58ca86
Qt bug fixed with cvWaitKey(0)
2010-08-15 20:43:54 +00:00
Yannick Verdie
dec6f2c393
Qt fixed bug with OpenGL, and save issue reported in #520
2010-08-14 18:36:53 +00:00
Vadim Pisarevsky
26c6b955a8
updated ffmpeg to 0.6.0
2010-08-05 17:24:41 +00:00
Yannick Verdie
2505e7e267
Qt: disable KEEP_RATIO with OpenGL to avoid a blinking bug
...
Qt: Now OpenGL rendering is ok
2010-08-02 17:10:43 +00:00
Vadim Pisarevsky
3510b4c81e
fixed "undefined cvCreateCameraCapture_V4L" linker errors on some linux distros (thanks to miguelinux for the patch)
2010-08-02 12:55:20 +00:00
Yannick Verdie
d6bbaea28a
Qt imgRegion bug fixed
...
Qt compilation pb with OpenGL flags fixed
2010-08-02 10:58:25 +00:00
Yannick Verdie
e8aad75446
Fixed bugs on Qt
2010-07-31 18:04:28 +00:00
Yannick Verdie
8f8aba9c88
fixed Qt bug
2010-07-30 14:13:20 +00:00
Vadim Pisarevsky
6da8d7cb52
temporarily disable 16-bit input in cap_dc1394_v2.cpp (ticket #296 ). thanks to sebastians for the patch!
2010-07-29 12:44:23 +00:00
Yannick Verdie
8f33e89d46
working on OpenGL for Windows
2010-07-28 21:55:55 +00:00
Yannick Verdie
7ce53adac9
Qt:
...
Fixed bug with exclusive buttons
Fixed memory leaks
2010-07-28 20:59:41 +00:00
Yannick Verdie
c77e8fc638
Qt - debugging Linux and Windows
2010-07-27 17:29:22 +00:00
Yannick Verdie
21b0652c40
QT statusbar bug fixed for Windows
2010-07-27 14:17:43 +00:00
Yannick Verdie
b0ab2ef16d
Qt on Windows -- in progress
2010-07-27 13:14:56 +00:00
Yannick Verdie
bb2fe87b32
2010-07-26 12:28:33 +00:00
Yannick Verdie
f2353b8523
QT new functions:
...
- cvCreateOpenGLCallback: draw 3D on top of the image
2010-07-23 15:22:04 +00:00
Yannick Verdie
ffe7bdf69c
ticket 490:
...
bool not defined ? -> changed everything in int
2010-07-23 12:09:13 +00:00
Yannick Verdie
f572047496
QT new functions:
...
- add CV_RADIOBOX with exclusive mode
2010-07-22 21:46:27 +00:00
Yannick Verdie
2c923c7eba
QT new functions:
...
- cvAddButton changed to match requirement
- CV_GUI_NORMAL and CV_GUI_EXPANDED done
- context menu with right click
2010-07-22 20:39:44 +00:00
Yannick Verdie
14bf624af4
QT new functions:
...
- cvAddButton done
- All the "actions" of the toolbar are working
- Window properties done
2010-07-20 09:39:36 +00:00
Vadim Pisarevsky
f894d1de31
replaced unlink() & _unlink() with more standard remove() (ticket #334 )
2010-07-17 11:51:17 +00:00
Vadim Pisarevsky
758e826d2e
do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV
2010-07-16 22:38:57 +00:00
Yannick Verdie
9fae7aee5b
QT new functions:
...
- fixed icvFindTrackbar bug
2010-07-16 15:22:07 +00:00
Vadim Pisarevsky
670fff5f42
added workaround for strange tmpnam() output from VS2010. turned off optimization for DCT & DFT on Win64 for VS200x (VS2010 builds it fine)
2010-07-16 14:16:18 +00:00
Vadim Pisarevsky
f78a3b4cc1
updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings
2010-07-16 12:54:53 +00:00
Yannick Verdie
0c9eca7922
QT new functions:
...
- Finished toolbar: the last icon opens an external window with the trackbars inside
2010-07-16 12:51:29 +00:00
Yannick Verdie
f5ab36f4df
QT new functions:
...
- Add icons for toolbar in new folder (files_Qt) (later, will delete useless icons)
2010-07-16 09:15:58 +00:00
Yannick Verdie
ddc29e08be
QT new functions:
...
- Add toolbar
- Clean the code
- Window properties in progress
2010-07-16 09:12:15 +00:00
Stefano Fabri
1c7297f5be
Another little fix for Monocrome frame
2010-07-13 18:11:45 +00:00
Stefano Fabri
3499703ede
Fixed a typo
2010-07-13 18:08:20 +00:00
Stefano Fabri
22d22fd925
Some little fix in pvapi backend
2010-07-13 17:58:08 +00:00
Vadim Pisarevsky
fa91788222
disabled Qt by default (until the code is stabilized)
2010-07-12 15:29:31 +00:00
Yannick Verdie
e11a77cb70
use sleep instead of usleep on window
2010-07-12 15:24:15 +00:00
Yannick Verdie
f2971aebd0
Ticket #458
2010-07-12 14:39:31 +00:00
Yannick Verdie
c3eb7881f1
New functions with QT GUI:
...
- 3 new points mostly done:
- OpenGL support enabled (windows are rendered using GPU)
- Save current screen (with overlay and so on...) with shortcut CTRL+S
- Text rendering (with any system font, and possibility to set the style - normal, italic,... - the weight - normal, bold, ... - the color, the spacing between letters, and so on...)
2010-07-12 11:04:26 +00:00
Vadim Pisarevsky
269afb91da
make Qt bindings compile with any Qt 4.x
2010-07-08 11:24:32 +00:00
Yannick Verdie
3d55d4818b
New functions with QT GUI:
...
- Save current screen (CTRL+S), with png, jpg, jpeg, bmp format support
- OpenGL rendering enable (make Qt very fast)
-> working on opengl callback (done soon)
- Rendering optimised (with and without openGL)
2010-07-07 17:53:59 +00:00
Vadim Pisarevsky
7d006e368e
fixed image rendering and memory leak in waitKey (thanks to Bart Nabbe and Steve Bushell)
2010-07-06 16:06:11 +00:00
Vadim Pisarevsky
576adb434d
removed embedded (obsolete) OpenEXR files; repaired OpenEXR bindings
2010-07-04 12:32:31 +00:00
Vadim Pisarevsky
afdaafd4b8
fixed compile problem (thanks to Pierre Moulon)
2010-07-03 21:54:10 +00:00
Yannick Verdie
89d9345cae
New functions with QT GUI:
...
- fixed bug ticket #412
2010-06-30 14:50:29 +00:00
Yannick Verdie
2f4d396506
New functions with QT GUI:
...
- save/load window parameters implemented !
2010-06-29 22:14:24 +00:00
Vadim Pisarevsky
d9ff8a30f5
fixed compile errors on Ubuntu 10.04
2010-06-29 15:49:44 +00:00
Yannick Verdie
f668a230ea
New functions with QT GUI:
...
- imgregion shortcut implemented (CTRL+O)
2010-06-28 21:15:54 +00:00
Yannick Verdie
f8c83340b2
New functions with QT GUI:
...
- imgregion (as with Matlab) implemented
2010-06-28 21:01:37 +00:00
Yannick Verdie
4bcd81f85f
New functions with QT GUI:
...
- aspectRatio is controled by cvSet/getWindowProperty
2010-06-26 22:36:41 +00:00
Yannick Verdie
397b31e437
New functions with QT GUI:
...
- fix CMake OpenGL compilation
2010-06-26 14:33:14 +00:00
Yannick Verdie
6314cd28cf
New functions with QT GUI:
...
- fix zoom offset of 0.5
- fix CMake problem with QT detection
- Code optimisation
2010-06-25 17:19:11 +00:00
Stefano Fabri
2dcad1eb81
Added some paramter to set exposure, adaptable packet size
2010-06-25 13:18:40 +00:00
Stefano Fabri
2d0b20df9e
Removed a debug print
2010-06-24 18:23:57 +00:00
Stefano Fabri
183f2306c8
Initializaed monocrom variable on costructor
2010-06-24 17:54:49 +00:00
Stefano Fabri
c7cf80fd59
Enable pixelformat check
2010-06-24 16:27:41 +00:00
Stefano Fabri
a419ecfde5
Return false if cannot adapt packed size with mtu max of network adapter
2010-06-24 15:23:43 +00:00
Stefano Fabri
686737e24f
Add support for monocrome cmos ccd
...
Adapted mtu and packed size
Some minor fixes in gstreamer because not implemented support of v4l v4l2 in the wrapper
default beahvior must be v4l v4l2 or libv4l backends
2010-06-24 13:38:57 +00:00
Vadim Pisarevsky
4ec4cf6876
fixed memory leaks in cocoa bindings (trac ticket #253 ). Thanks to N. Butko
2010-06-24 12:28:23 +00:00
Yannick Verdie
f69514eef7
New functions with QT GUI:
...
StatusBar with zoom/color/position information
user can display infor mation in statusbar with cvDisplayStatusBar(window,text,delay_ms)
2010-06-22 17:15:49 +00:00
Yannick Verdie
f2392f2e2f
New functions with QT GUI:
...
- fix c++ wrapper
- fix compilation bugs
2010-06-20 11:18:23 +00:00
Yannick Verdie
2f9aedfaab
New functions with QT GUI:
...
- fix c++ wrapper
- rename cvInformation in cvDisplayOverlay
2010-06-20 10:29:11 +00:00
Yannick Verdie
bd643ad550
New functions with QT GUI:
...
Fixed memory leak
Disable QT by default
2010-06-20 08:44:19 +00:00
Yannick Verdie
c007b60b25
New functions with QT GUI:
...
Fixed bugs indicated by Vadim
2010-06-19 21:01:27 +00:00
Yannick Verdie
5cbe64dac7
New functions with QT GUI
...
Shortcut for zoom (CTRL + and CTRL - for zoomin/out, CTRL Left/Right/Up/Down for panning, CTRL P for zoom = 1)
Fix bug with key event
2010-06-19 18:57:04 +00:00
Vadim Pisarevsky
47620085b5
added dummy cvInitSystem() to Qt bindings to avoid "unresolved symbol" errors
2010-06-19 16:26:22 +00:00
Filipe Almeida
e78373f4b8
V4L2: removed setting device control values to initial values on capture
...
release
2010-06-19 14:34:44 +00:00
Yannick Verdie
3d2ec9875d
New functions with QT GUI
...
Mouse callback return correct value during zoom/panning
Window overview in zoom mode done !
2010-06-17 20:44:18 +00:00
Yannick Verdie
386496863c
New functions with QT GUI
...
use inv matrix for Zoom in/out for better result
Fix some bugs with zoom/panning
2010-06-17 16:41:48 +00:00
Yannick Verdie
f4dba4686d
New functions with QT GUI (presented in the 4th report)
...
-Fullscreen
-Change Autoresize dynamically (after windows are created)
-Zoom on mouse location (with wheel)
-Panning by click'ndrag posible after zooming
2010-06-16 07:58:53 +00:00
Yannick Verdie
c4fded9afa
New functions with QT GUI
...
Zoom function done, working on panning now (weel enable it)
Fixed mouse coordinate bugs
2010-06-14 16:00:38 +00:00
Yannick Verdie
be292046d8
working on QT change/get win property (done)
...
Fullscreen done
change autoresize dynamically done
2010-06-12 18:08:27 +00:00
Yannick Verdie
e71c5e8754
working on QT change/get win property (stylesheet for cvTrackBar fixed !!!)
2010-06-12 16:56:01 +00:00
Yannick Verdie
9eea2a5fe6
working on QT change/get win property (stylesheet for cvTrackBar fixed !!!)
2010-06-12 16:36:46 +00:00
Vadim Pisarevsky
d7691f6cad
another attempt to fix cvcap_ffmpeg.cpp compile errors
2010-06-11 18:43:46 +00:00
Yannick Verdie
f6f634bace
working on QT change/get win property (stylesheet for cvTrackBar fixed !!!)
2010-06-11 09:02:57 +00:00
Yannick Verdie
802d5f9940
working on QT change/get win property
2010-06-11 07:35:36 +00:00
Vadim Pisarevsky
fb2e7142b1
handle missing UINT64_C definition
2010-06-11 03:59:43 +00:00
Yannick Verdie
6cc7fb67dd
fix bugs
2010-06-10 20:31:55 +00:00
Yannick Verdie
799460bd66
will work on the trunk
2010-06-10 20:03:52 +00:00
Yannick Verdie
c6872100db
Start integrating QT GUI (GoC 2010)
2010-06-07 08:29:10 +00:00
Vadim Pisarevsky
93d469956d
fixed reading of certain BMP files
2010-06-06 16:44:38 +00:00
Vadim Pisarevsky
eec30b08d4
added cv::setMouseCallback and cv::startWindowThread
2010-05-18 15:47:39 +00:00
Vadim Pisarevsky
26b7ed6901
renamed gstappsink.hpp->gstappsink.h
2010-05-12 14:51:52 +00:00
Filipe Almeida
3d12bc6b9f
LIBV4L: precomp.hpp include missing
2010-05-12 11:40:40 +00:00
Filipe Almeida
17292f686e
LIBV4L: fixed build failed on Linux
2010-05-12 10:33:08 +00:00
Vadim Pisarevsky
4a073bd951
fixed build on Linux
2010-05-12 07:33:21 +00:00
Vadim Pisarevsky
127d6649a1
"atomic bomb" commit. Reorganized OpenCV directory structure
2010-05-11 17:44:00 +00:00