Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
11 years ago
Roman Donchenko
1188894133
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
11 years ago
Roman Donchenko
2ca49eef37
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
(cherry picked from commit dfe07df87b
)
11 years ago
Roman Donchenko
5a5d569d72
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
(cherry picked from commit 424a7b0ab0
)
Conflicts:
modules/highgui/test/test_ffmpeg.cpp
11 years ago
Roman Donchenko
260c2e0b08
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
(cherry picked from commit 3f3ae33327
)
11 years ago
Roman Donchenko
dfe07df87b
Added stupid hacks to make the video tests pass with FFmpeg 2.0.2.
...
Need to go back at some point and fix this for real.
11 years ago
Roman Donchenko
424a7b0ab0
Changed MPEG-2 resolution in the FFmpeg test.
...
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
11 years ago
Roman Donchenko
3f3ae33327
Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.
...
This should actually remove the need for the workaround from
the previous commit.
11 years ago
Roman Donchenko
eb86d37b26
Removed some dubious FFmpeg hack that no longer works.
11 years ago
Vladislav Vinogradov
fa70f95272
fix imshow under Windows with OpenGL support:
...
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
11 years ago
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
11 years ago
Ilya Lavrenov
35d9ce0c0c
fixed warnings
11 years ago
Roman Donchenko
3cfad385ec
Fix a -Wshadow warning in cap_openni.cpp.
11 years ago
Roman Donchenko
32630dbf61
Adapt cap_openni.cpp to the new Ptr.
11 years ago
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
11 years ago
Roman Donchenko
fa9d092c43
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
11 years ago
Tony
0d06b1dced
Change true for TRUE
...
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
11 years ago
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
11 years ago
Tony
97fc1e10a7
Replace obsolete Gtk symbols
...
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.
The following symbols have been replaced in this commit:
Gtk symbols that have been moved to the Gdk library:
- GtkType -> Gtype
- GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
- gtk_signal_connect -> g_signal_connect
- GTK_SIGNAL_FUNC -> G_CALLBACK
- gtk_type_class -> g_type_class_peek
- gtk_type_new-> g_object_new
- GtkTypeInfo -> GtypeInfo (Not required for
g_type_register_static_simple)
- gtk_type_unique -> g_type_register_static_simple
- gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
NB: This requires porting to use cairo contexts and GdkPixbufs.
The following gtk symbols are changed for their modern equivalent:
- GTK_WIDGET_REALIZED -> gtk_widget_get_realized
- GTK_OBJECT_FLAGS -> gtk_widget_set_realized
Symbols without replacement:
- gtk_range_set_update_policy -> No replacement; as default policy is
set to continuous we can delete this line.
11 years ago
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
11 years ago
StevenPuttemans
1b1fb131b3
Attempt at fixing bug 3186
11 years ago
Alexander Smorkalov
06a7a1ac47
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.
...
QVector range check exception fixed.
11 years ago
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
11 years ago
Roman Donchenko
ad52dd37a9
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
...
This reverts commit 41b8479d03
, reversing
changes made to 531471b0aa
.
Reason: breaks the build.
11 years ago
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
beeb932d22
Boring changes - highgui.
11 years ago
Alexander Shishkov
e354fa3fd1
fixed test data in highgui test for HDR
11 years ago
Vladislav Vinogradov
a41006754e
fix documentation
11 years ago
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
11 years ago
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
11 years ago
StevenPuttemans
e7921c3fe7
Added changes suggested by bug #3186 : fixing the unplugging of webcam
11 years ago
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
11 years ago
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
11 years ago
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
11 years ago
Alexander Shishkov
88712d97c6
fix CMake changes
11 years ago
Alexander Shishkov
396f6bb55f
fixed problems with building iOS version
11 years ago
Fedor Morozov
e2e604eb18
HDR writing bug fix
11 years ago
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
11 years ago
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
11 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
11 years ago
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
11 years ago
Hanusz Leszek
32635a6834
using unsigned char instead of uint8_t to compile under windows
11 years ago
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
11 years ago
Alexander Smorkalov
9af2c1661a
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
...
for libpng added.
11 years ago
kamjagin
69287c936b
missed # in if defined
11 years ago
kamjagin
c24c1a5926
added HAVE_QTKIT to tests
11 years ago
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
11 years ago
WonderRico
d067749c21
fix _index / index
11 years ago
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
11 years ago
WonderRico
a048387376
fix formating
11 years ago