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
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
