Pierre Letessier [Wed, 21 Oct 2015 08:32:38 +0000 (10:32 +0200)]
Added CV_CAP_PROP_SAR properties to videoio module
Alexander Alekhin [Fri, 23 Oct 2015 16:35:36 +0000 (16:35 +0000)]
Merge pull request #5489 from paroj:v4l2noconvert
Alexander Alekhin [Fri, 23 Oct 2015 16:28:26 +0000 (16:28 +0000)]
Merge pull request #5474 from paroj:v4l2ctrls
Maksim Shabunin [Fri, 23 Oct 2015 10:58:10 +0000 (10:58 +0000)]
Merge pull request #5562 from rodrigob:patch-2
Rodrigo Benenson [Thu, 22 Oct 2015 21:27:55 +0000 (23:27 +0200)]
mush -> must
fixed typo
Alexander Alekhin [Thu, 22 Oct 2015 16:28:41 +0000 (16:28 +0000)]
Merge pull request #5531 from mshabunin:fix-vs2015
Alexander Alekhin [Thu, 22 Oct 2015 12:37:40 +0000 (12:37 +0000)]
Merge pull request #5513 from jet47:ctest-extended-support
Maksim Shabunin [Thu, 22 Oct 2015 12:27:45 +0000 (12:27 +0000)]
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
Maksim Shabunin [Thu, 22 Oct 2015 12:25:47 +0000 (12:25 +0000)]
Merge pull request #5365 from sturkmen72:patch-2
Maksim Shabunin [Thu, 22 Oct 2015 12:24:47 +0000 (12:24 +0000)]
Merge pull request #5432 from sturkmen72:patch-11
Maksim Shabunin [Thu, 22 Oct 2015 09:44:03 +0000 (12:44 +0300)]
Enable temp objects destruction test for VS versions less than 2015
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:52 +0000 (11:54 +0000)]
Merge pull request #5539 from sturkmen72:patch-14
Vadim Pisarevsky [Wed, 21 Oct 2015 11:54:30 +0000 (11:54 +0000)]
Merge pull request #5532 from grundman:patch-2
Vadim Pisarevsky [Wed, 21 Oct 2015 11:46:27 +0000 (11:46 +0000)]
Merge pull request #5542 from renatoGarcia:matx_constructors
Vadim Pisarevsky [Wed, 21 Oct 2015 11:44:35 +0000 (11:44 +0000)]
Merge pull request #5543 from aman11dhanpat:master
Vadim Pisarevsky [Wed, 21 Oct 2015 11:41:25 +0000 (11:41 +0000)]
Merge pull request #5548 from berak:patch-2
berak [Tue, 20 Oct 2015 09:57:29 +0000 (11:57 +0200)]
update python features2d tutorials
Suleyman TURKMEN [Fri, 18 Sep 2015 08:39:39 +0000 (11:39 +0300)]
Update face detection samples
Maksim Shabunin [Tue, 20 Oct 2015 14:43:33 +0000 (14:43 +0000)]
Merge pull request #5519 from hyunkim9123:camshift_py
Maksim Shabunin [Fri, 16 Oct 2015 14:10:00 +0000 (17:10 +0300)]
Visual Studio 2015 warning and test fixes
Alexander Alekhin [Mon, 19 Oct 2015 15:27:35 +0000 (15:27 +0000)]
Merge pull request #5431 from MiguelAlgaba:em_one_cluster
Aman Verma [Mon, 19 Oct 2015 10:58:43 +0000 (10:58 +0000)]
Fixing compilation errors in windows and mac
Aman Verma [Mon, 19 Oct 2015 08:44:06 +0000 (08:44 +0000)]
Fix for #5495 : add setTrackbarMin
Renato Florentino Garcia [Mon, 19 Oct 2015 01:16:21 +0000 (23:16 -0200)]
Fix behavior of Matx 12 and 16 args constructors.
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
Suleyman TURKMEN [Sun, 18 Oct 2015 11:50:39 +0000 (14:50 +0300)]
Update imgproc.hpp
Pavel Rojtberg [Sun, 11 Oct 2015 13:23:47 +0000 (15:23 +0200)]
cap_v4l: implement PROP_CONVERT_RGB
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.
Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
Pavel Rojtberg [Sun, 11 Oct 2015 14:28:01 +0000 (16:28 +0200)]
fix wrong ifdef bracketing
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
Pavel Rojtberg [Sun, 11 Oct 2015 16:06:02 +0000 (18:06 +0200)]
add python sample to test/ showcase new cap_v4l2 features
Pavel Rojtberg [Sat, 10 Oct 2015 11:42:26 +0000 (13:42 +0200)]
replace custom yuyv_to_rgb24 implementation by cvtColor
Pavel Rojtberg [Sat, 10 Oct 2015 11:14:57 +0000 (13:14 +0200)]
avoid needless copies during mjpeg decoding
Pavel Rojtberg [Sun, 18 Oct 2015 11:37:31 +0000 (13:37 +0200)]
remove additional V4L2 pixelformat defines
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
Pavel Rojtberg [Sat, 10 Oct 2015 10:39:37 +0000 (12:39 +0200)]
simplify autosetup_capture_mode_v4l2 by using a for loop
Pavel Rojtberg [Sat, 10 Oct 2015 10:26:08 +0000 (12:26 +0200)]
implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
Pavel Rojtberg [Fri, 9 Oct 2015 14:01:14 +0000 (16:01 +0200)]
allow changing FPS and Image Size using V4L2
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
Pavel Rojtberg [Fri, 9 Oct 2015 10:05:29 +0000 (12:05 +0200)]
allow icvGetPropertyCAM_V4L to return zero
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
Pavel Rojtberg [Thu, 8 Oct 2015 14:56:18 +0000 (16:56 +0200)]
support setting focus and autofocus with V4L2
also refactor property range handling and opencv property to V4L2
translation.
grundman [Fri, 16 Oct 2015 18:19:27 +0000 (11:19 -0700)]
Fix racy modification of ForThread::m_state during invocation of stop()
paul.kim [Thu, 15 Oct 2015 02:03:46 +0000 (11:03 +0900)]
Fix the issue in mouse click event
Alexander Alekhin [Wed, 14 Oct 2015 13:05:18 +0000 (13:05 +0000)]
Merge pull request #5478 from alalek:fix_android_pack_build
Alexander Alekhin [Wed, 14 Oct 2015 09:14:43 +0000 (09:14 +0000)]
Merge pull request #5507 from rodrigob:patch-1
Alexander Alekhin [Wed, 14 Oct 2015 09:14:10 +0000 (09:14 +0000)]
Merge pull request #5509 from spmallick:master
Alexander Alekhin [Wed, 14 Oct 2015 09:10:30 +0000 (09:10 +0000)]
Merge pull request #5504 from aman11dhanpat:master
Alexander Alekhin [Wed, 14 Oct 2015 09:09:30 +0000 (09:09 +0000)]
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
spmallick [Tue, 13 Oct 2015 22:51:43 +0000 (15:51 -0700)]
Update window_QT.h
QPushButton was included twice.
Rodrigo Benenson [Tue, 13 Oct 2015 17:04:06 +0000 (19:04 +0200)]
CommandLineParser missing gpu option
As is it was not possible to use CUDA.
Vladislav Vinogradov [Fri, 12 Dec 2014 15:21:57 +0000 (18:21 +0300)]
add CTest support to build tree
Vladislav Vinogradov [Tue, 9 Dec 2014 12:46:00 +0000 (15:46 +0300)]
assing labels to targets and sources
Alexander Alekhin [Tue, 13 Oct 2015 14:24:09 +0000 (14:24 +0000)]
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
AlexanderStohr [Tue, 13 Oct 2015 13:52:42 +0000 (15:52 +0200)]
fix VS2010 error with type mismatch due to volatile qualifier
Alexander Stohr [Wed, 22 Jul 2015 09:11:58 +0000 (11:11 +0200)]
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
StevenPuttemans [Tue, 13 Oct 2015 12:23:28 +0000 (14:23 +0200)]
adding extra explanation for mask parameter
Pavel Vlasov [Tue, 13 Oct 2015 07:41:09 +0000 (10:41 +0300)]
Fix for filter2D and IPP < 900
Alexander Alekhin [Mon, 12 Oct 2015 17:44:02 +0000 (17:44 +0000)]
Merge pull request #5486 from amroamroamro:fix_ml_randMVNormal
Aman Verma [Mon, 12 Oct 2015 16:16:27 +0000 (16:16 +0000)]
Fix for #5481, removing repeated/useless assignment in contours.cpp
Alexander Alekhin [Mon, 12 Oct 2015 15:12:34 +0000 (18:12 +0300)]
android: add targetSdkVersion="21"
Alexander Alekhin [Mon, 12 Oct 2015 11:27:05 +0000 (14:27 +0300)]
android: force OpenCV library target to "android-21"
Pavel Vlasov [Mon, 12 Oct 2015 07:51:28 +0000 (10:51 +0300)]
Fixes for IPP integration:
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;
IppAutoBuffer class was added;
Amro [Sat, 10 Oct 2015 22:54:11 +0000 (01:54 +0300)]
fix randMVNormal in ML (#5469)
Fix the failed assertion by replacing the GEMM call.
Also random numbers are generated from normal distribution ~N(0,1),
instead of uniform distribution ~U(0,1).
Alexander Alekhin [Fri, 9 Oct 2015 14:06:01 +0000 (17:06 +0300)]
cleanup <build>/src|gen folders to remove stalled/unused Java files
Alexander Alekhin [Fri, 9 Oct 2015 11:31:32 +0000 (11:31 +0000)]
Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials
Alexander Alekhin [Thu, 8 Oct 2015 13:31:51 +0000 (13:31 +0000)]
Merge pull request #5470 from apavlenko:android_camera_gl_view
Alexander Alekhin [Thu, 8 Oct 2015 12:37:57 +0000 (12:37 +0000)]
Merge pull request #5468 from AVshokurov:master
Anton V. Shokurov [Wed, 7 Oct 2015 19:16:24 +0000 (15:16 -0400)]
The latest version (5.1.1) of the gnu compiler returns just its major version ("5") when given the "-dumpversion" argument. Gnu compiler developers don't consider this to be an error. A workaround for this case has been made.
Andrey Pavlenko [Thu, 8 Oct 2015 10:48:46 +0000 (13:48 +0300)]
fix build with CMake
now it builds by the command:
`cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`
StevenPuttemans [Thu, 8 Oct 2015 09:03:30 +0000 (11:03 +0200)]
adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ...
Andrey Pavlenko [Thu, 8 Oct 2015 09:21:05 +0000 (12:21 +0300)]
minor fixes
Andrey Pavlenko [Wed, 7 Oct 2015 15:59:43 +0000 (18:59 +0300)]
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
Alexander Alekhin [Wed, 7 Oct 2015 14:47:16 +0000 (14:47 +0000)]
Merge pull request #5460 from sergiud:highgui-autosize-gtk3
Alexander Alekhin [Wed, 7 Oct 2015 14:42:28 +0000 (14:42 +0000)]
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
Alexander Alekhin [Wed, 7 Oct 2015 14:41:44 +0000 (14:41 +0000)]
Merge pull request #5462 from alalek:fix_x86_detection
Andrey Pavlenko [Wed, 7 Oct 2015 08:28:57 +0000 (11:28 +0300)]
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
Alexander Alekhin [Tue, 6 Oct 2015 17:42:21 +0000 (20:42 +0300)]
workaround for 32-bit OS on 64-bit x86 CPU
Alexander Alekhin [Tue, 6 Oct 2015 17:12:03 +0000 (17:12 +0000)]
Merge pull request #5459 from aman11dhanpat:master
Alexander Alekhin [Tue, 6 Oct 2015 17:11:47 +0000 (17:11 +0000)]
Merge pull request #5458 from berak:fix_putText
berak [Tue, 6 Oct 2015 14:14:15 +0000 (16:14 +0200)]
fix zero length std::string in putText()
Sergiu Dotenco [Tue, 6 Oct 2015 15:01:28 +0000 (17:01 +0200)]
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
Aman Verma [Tue, 6 Oct 2015 14:23:27 +0000 (14:23 +0000)]
Adding fix for issue 5451 "putText fails with empty std::string"
Sergiu Dotenco [Tue, 6 Oct 2015 13:09:31 +0000 (15:09 +0200)]
videoio: fixed segmentation fault at frame size change
Alexander Alekhin [Tue, 6 Oct 2015 10:01:59 +0000 (10:01 +0000)]
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data
Alexander Alekhin [Tue, 6 Oct 2015 10:01:39 +0000 (10:01 +0000)]
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
Alexander Alekhin [Mon, 5 Oct 2015 16:28:35 +0000 (19:28 +0300)]
ffmpeg: fix invalid NULL pointer access
Catched on Ubuntu 12.04 with FFMPEG:
codec: YES (ver 53.35.0)
format: YES (ver 53.21.1)
util: YES (ver 51.22.3)
swscale: YES (ver 2.1.0)
resample: NO
gentoo-style: YES
Alexander Alekhin [Mon, 5 Oct 2015 12:50:17 +0000 (12:50 +0000)]
Merge pull request #5429 from PhilLab:patch-6
Alexander Alekhin [Mon, 5 Oct 2015 12:47:10 +0000 (12:47 +0000)]
Merge pull request #5453 from paroj:capgstleak
Pavel Rojtberg [Mon, 5 Oct 2015 10:28:47 +0000 (12:28 +0200)]
do not leak GstMapInfo
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
Alexander Alekhin [Fri, 2 Oct 2015 15:27:18 +0000 (18:27 +0300)]
fix ffmpeg frame creation (fix #5439)
Alexander Alekhin [Fri, 2 Oct 2015 12:51:09 +0000 (12:51 +0000)]
Merge pull request #5399 from alalek:fix_5264
Alexander Alekhin [Fri, 2 Oct 2015 12:50:38 +0000 (12:50 +0000)]
Merge pull request #5436 from jet47:fix-cuda-normalize
Alexander Alekhin [Fri, 2 Oct 2015 12:49:36 +0000 (12:49 +0000)]
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
Suleyman TURKMEN [Thu, 1 Oct 2015 14:25:18 +0000 (17:25 +0300)]
Update imgcodecs.hpp
Vladislav Vinogradov [Fri, 2 Oct 2015 08:41:01 +0000 (11:41 +0300)]
fix cuda::normalize (dtype < 0) case
Pavel Vlasov [Thu, 1 Oct 2015 14:48:49 +0000 (17:48 +0300)]
IPPInitSingelton initialization guards;
Miguel Algaba [Thu, 1 Oct 2015 14:45:59 +0000 (16:45 +0200)]
Assert fix: allow one cluster as valid parameter
Vadim Pisarevsky [Thu, 1 Oct 2015 13:58:01 +0000 (13:58 +0000)]
Merge pull request #5385 from alalek:fix_android_camera_datarace
Philipp Hasper [Thu, 1 Oct 2015 13:09:14 +0000 (15:09 +0200)]
Typo in CameraBridgeViewBase.java
Corrected typo and unused imports
Vadim Pisarevsky [Thu, 1 Oct 2015 13:01:26 +0000 (13:01 +0000)]
Merge pull request #5402 from sturkmen72:patch-10
Vadim Pisarevsky [Thu, 1 Oct 2015 12:54:11 +0000 (12:54 +0000)]
Merge pull request #5408 from alalek:move_ippicv_binaries
Vadim Pisarevsky [Thu, 1 Oct 2015 12:52:28 +0000 (12:52 +0000)]
Merge pull request #5409 from kauevestena:patch-1
Pavel Vlasov [Fri, 25 Sep 2015 15:00:53 +0000 (18:00 +0300)]
IPPInitSingelton was added to contain IPP related global variables;
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
Alexander Alekhin [Wed, 30 Sep 2015 17:36:43 +0000 (17:36 +0000)]
Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration
Alexander Alekhin [Tue, 29 Sep 2015 17:11:30 +0000 (17:11 +0000)]
Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change