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
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.
11 years ago
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
11 years ago
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
11 years ago
WonderRico
7e7fb0b75d
Bug #3201 fix
11 years ago
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
11 years ago
Roman Donchenko
2f780ed994
Fix whitespace errors.
11 years ago
Fedor Morozov
bef8d8192e
Minor fixes, new MergeDebevec
11 years ago
Fedor Morozov
17609b90c7
Mantiuk's tonemapping
11 years ago
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
12 years ago
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
12 years ago
Fedor Morozov
302bf23f82
All hdr functions as Algorithms
12 years ago
StevenPuttemans
4dff5b7c72
Added bugfix #2795
...
- changing license header
- fixed bug in QtKit when changing camera resolution
12 years ago
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
12 years ago
abidrahmank
fa1b96bd36
imshow docs improvement bug#2490
12 years ago
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?
12 years ago
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
12 years ago
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
12 years ago
Fedor Morozov
703cf8cef7
Calibration, various changes
12 years ago
Philippe FOUBERT
9c04db554f
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
12 years ago
Fedor Morozov
ec668ce3a7
Documentation
12 years ago
Alexander Shishkov
a29ce401d5
minore changes in test on HDR fromat
12 years ago
Alexander Shishkov
8ccca90dca
small changes
...
added including for precomp
12 years ago
Vadim Pisarevsky
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
12 years ago