platform/upstream/opencv.git
9 years agoAdded example to the documentation for the NormTypes enum (L1, L2, INF)
Jan S. (Milania1) [Thu, 15 Oct 2015 17:16:07 +0000 (19:16 +0200)]
Added example to the documentation for the NormTypes enum (L1, L2, INF)

9 years agoMerge pull request #5478 from alalek:fix_android_pack_build
Alexander Alekhin [Wed, 14 Oct 2015 13:05:18 +0000 (13:05 +0000)]
Merge pull request #5478 from alalek:fix_android_pack_build

9 years agoMerge pull request #5507 from rodrigob:patch-1
Alexander Alekhin [Wed, 14 Oct 2015 09:14:43 +0000 (09:14 +0000)]
Merge pull request #5507 from rodrigob:patch-1

9 years agoMerge pull request #5509 from spmallick:master
Alexander Alekhin [Wed, 14 Oct 2015 09:14:10 +0000 (09:14 +0000)]
Merge pull request #5509 from spmallick:master

9 years agoMerge pull request #5504 from aman11dhanpat:master
Alexander Alekhin [Wed, 14 Oct 2015 09:10:30 +0000 (09:10 +0000)]
Merge pull request #5504 from aman11dhanpat:master

9 years agoMerge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
Alexander Alekhin [Wed, 14 Oct 2015 09:09:30 +0000 (09:09 +0000)]
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix

9 years agoUpdate window_QT.h
spmallick [Tue, 13 Oct 2015 22:51:43 +0000 (15:51 -0700)]
Update window_QT.h

QPushButton was included twice.

9 years agoCommandLineParser missing gpu option
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.

9 years agoMerge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
Alexander Alekhin [Tue, 13 Oct 2015 14:24:09 +0000 (14:24 +0000)]
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes

9 years agofix VS2010 error with type mismatch due to volatile qualifier
AlexanderStohr [Tue, 13 Oct 2015 13:52:42 +0000 (15:52 +0200)]
fix VS2010 error with type mismatch due to volatile qualifier

9 years agonot only print file-not-found as a warning but also print the name of the problematic...
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

9 years agoFix for filter2D and IPP < 900
Pavel Vlasov [Tue, 13 Oct 2015 07:41:09 +0000 (10:41 +0300)]
Fix for filter2D and IPP < 900

9 years agoMerge pull request #5486 from amroamroamro:fix_ml_randMVNormal
Alexander Alekhin [Mon, 12 Oct 2015 17:44:02 +0000 (17:44 +0000)]
Merge pull request #5486 from amroamroamro:fix_ml_randMVNormal

9 years agoFix for #5481, removing repeated/useless assignment in contours.cpp
Aman Verma [Mon, 12 Oct 2015 16:16:27 +0000 (16:16 +0000)]
Fix for #5481, removing repeated/useless assignment in contours.cpp

9 years agoandroid: add targetSdkVersion="21"
Alexander Alekhin [Mon, 12 Oct 2015 15:12:34 +0000 (18:12 +0300)]
android: add targetSdkVersion="21"

9 years agoandroid: force OpenCV library target to "android-21"
Alexander Alekhin [Mon, 12 Oct 2015 11:27:05 +0000 (14:27 +0300)]
android: force OpenCV library target to "android-21"

9 years agoFixes for IPP integration:
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;

9 years agofix randMVNormal in ML (#5469)
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).

9 years agocleanup <build>/src|gen folders to remove stalled/unused Java files
Alexander Alekhin [Fri, 9 Oct 2015 14:06:01 +0000 (17:06 +0300)]
cleanup <build>/src|gen folders to remove stalled/unused Java files

9 years agoMerge pull request #5471 from StevenPuttemans:add_images_python_tutorials
Alexander Alekhin [Fri, 9 Oct 2015 11:31:32 +0000 (11:31 +0000)]
Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials

9 years agoMerge pull request #5470 from apavlenko:android_camera_gl_view
Alexander Alekhin [Thu, 8 Oct 2015 13:31:51 +0000 (13:31 +0000)]
Merge pull request #5470 from apavlenko:android_camera_gl_view

9 years agoMerge pull request #5468 from AVshokurov:master
Alexander Alekhin [Thu, 8 Oct 2015 12:37:57 +0000 (12:37 +0000)]
Merge pull request #5468 from AVshokurov:master

9 years agoThe latest version (5.1.1) of the gnu compiler returns just its major version ("5...
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.

9 years agofix build with CMake
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`

9 years agoadding missing images from python tutorials, like chessboard.png, simple.jpg, home...
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, ...

9 years agominor fixes
Andrey Pavlenko [Thu, 8 Oct 2015 09:21:05 +0000 (12:21 +0300)]
minor fixes

9 years agorefactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
Andrey Pavlenko [Wed, 7 Oct 2015 15:59:43 +0000 (18:59 +0300)]
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView

9 years agoMerge pull request #5460 from sergiud:highgui-autosize-gtk3
Alexander Alekhin [Wed, 7 Oct 2015 14:47:16 +0000 (14:47 +0000)]
Merge pull request #5460 from sergiud:highgui-autosize-gtk3

9 years agoMerge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
Alexander Alekhin [Wed, 7 Oct 2015 14:42:28 +0000 (14:42 +0000)]
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size

9 years agoMerge pull request #5462 from alalek:fix_x86_detection
Alexander Alekhin [Wed, 7 Oct 2015 14:41:44 +0000 (14:41 +0000)]
Merge pull request #5462 from alalek:fix_x86_detection

9 years agorefactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable...
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

9 years agoworkaround for 32-bit OS on 64-bit x86 CPU
Alexander Alekhin [Tue, 6 Oct 2015 17:42:21 +0000 (20:42 +0300)]
workaround for 32-bit OS on 64-bit x86 CPU

9 years agoMerge pull request #5459 from aman11dhanpat:master
Alexander Alekhin [Tue, 6 Oct 2015 17:12:03 +0000 (17:12 +0000)]
Merge pull request #5459 from aman11dhanpat:master

9 years agoMerge pull request #5458 from berak:fix_putText
Alexander Alekhin [Tue, 6 Oct 2015 17:11:47 +0000 (17:11 +0000)]
Merge pull request #5458 from berak:fix_putText

9 years agofix zero length std::string in putText()
berak [Tue, 6 Oct 2015 14:14:15 +0000 (16:14 +0200)]
fix zero length std::string in putText()

9 years agohighgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
Sergiu Dotenco [Tue, 6 Oct 2015 15:01:28 +0000 (17:01 +0200)]
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3

9 years agoAdding fix for issue 5451 "putText fails with empty std::string"
Aman Verma [Tue, 6 Oct 2015 14:23:27 +0000 (14:23 +0000)]
Adding fix for issue 5451 "putText fails with empty std::string"

9 years agovideoio: fixed segmentation fault at frame size change
Sergiu Dotenco [Tue, 6 Oct 2015 13:09:31 +0000 (15:09 +0200)]
videoio: fixed segmentation fault at frame size change

9 years agoMerge pull request #5454 from alalek:fix_ffmpeg_priv_data
Alexander Alekhin [Tue, 6 Oct 2015 10:01:59 +0000 (10:01 +0000)]
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data

9 years agoMerge pull request #5441 from alalek:fix_ffmpeg_frame_creation
Alexander Alekhin [Tue, 6 Oct 2015 10:01:39 +0000 (10:01 +0000)]
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation

9 years agoffmpeg: fix invalid NULL pointer access
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

9 years agoMerge pull request #5429 from PhilLab:patch-6
Alexander Alekhin [Mon, 5 Oct 2015 12:50:17 +0000 (12:50 +0000)]
Merge pull request #5429 from PhilLab:patch-6

9 years agoMerge pull request #5453 from paroj:capgstleak
Alexander Alekhin [Mon, 5 Oct 2015 12:47:10 +0000 (12:47 +0000)]
Merge pull request #5453 from paroj:capgstleak

9 years agodo not leak GstMapInfo
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.

9 years agofix ffmpeg frame creation (fix #5439)
Alexander Alekhin [Fri, 2 Oct 2015 15:27:18 +0000 (18:27 +0300)]
fix ffmpeg frame creation (fix #5439)

9 years agoMerge pull request #5399 from alalek:fix_5264
Alexander Alekhin [Fri, 2 Oct 2015 12:51:09 +0000 (12:51 +0000)]
Merge pull request #5399 from alalek:fix_5264

9 years agoMerge pull request #5436 from jet47:fix-cuda-normalize
Alexander Alekhin [Fri, 2 Oct 2015 12:50:38 +0000 (12:50 +0000)]
Merge pull request #5436 from jet47:fix-cuda-normalize

9 years agoMerge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
Alexander Alekhin [Fri, 2 Oct 2015 12:49:36 +0000 (12:49 +0000)]
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes

9 years agofix cuda::normalize (dtype < 0) case
Vladislav Vinogradov [Fri, 2 Oct 2015 08:41:01 +0000 (11:41 +0300)]
fix cuda::normalize (dtype < 0) case

9 years agoIPPInitSingelton initialization guards;
Pavel Vlasov [Thu, 1 Oct 2015 14:48:49 +0000 (17:48 +0300)]
IPPInitSingelton initialization guards;

9 years agoMerge pull request #5385 from alalek:fix_android_camera_datarace
Vadim Pisarevsky [Thu, 1 Oct 2015 13:58:01 +0000 (13:58 +0000)]
Merge pull request #5385 from alalek:fix_android_camera_datarace

9 years agoTypo in CameraBridgeViewBase.java
Philipp Hasper [Thu, 1 Oct 2015 13:09:14 +0000 (15:09 +0200)]
Typo in CameraBridgeViewBase.java

Corrected typo and unused imports

9 years agoMerge pull request #5402 from sturkmen72:patch-10
Vadim Pisarevsky [Thu, 1 Oct 2015 13:01:26 +0000 (13:01 +0000)]
Merge pull request #5402 from sturkmen72:patch-10

9 years agoMerge pull request #5408 from alalek:move_ippicv_binaries
Vadim Pisarevsky [Thu, 1 Oct 2015 12:54:11 +0000 (12:54 +0000)]
Merge pull request #5408 from alalek:move_ippicv_binaries

9 years agoMerge pull request #5409 from kauevestena:patch-1
Vadim Pisarevsky [Thu, 1 Oct 2015 12:52:28 +0000 (12:52 +0000)]
Merge pull request #5409 from kauevestena:patch-1

9 years agoIPPInitSingelton was added to contain IPP related global variables;
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;

9 years agoMerge pull request #5419 from lupustr3:pvlasov/ipp9_integration
Alexander Alekhin [Wed, 30 Sep 2015 17:36:43 +0000 (17:36 +0000)]
Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration

9 years agoMerge pull request #5415 from lupustr3:pvlasov/ipp_version_change
Alexander Alekhin [Tue, 29 Sep 2015 17:11:30 +0000 (17:11 +0000)]
Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change

9 years agoEnables support of IPP 9.0.0;
Pavel Vlasov [Fri, 25 Sep 2015 14:56:19 +0000 (17:56 +0300)]
Enables support of IPP 9.0.0;

HAVE_IPP_ICV_ONLY will be undefined if OpenCV was linked against ICV packet from IPP9 or greater. ICV9+ packets will be aligned with IPP in OpenCV APIs
This will ease code management between IPP and ICV

9 years agoIPP_VERSION_X100 was changed to:
Pavel Vlasov [Tue, 29 Sep 2015 14:24:18 +0000 (17:24 +0300)]
IPP_VERSION_X100 was changed to:
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;

9 years agoMerge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring
Alexander Alekhin [Mon, 28 Sep 2015 17:20:41 +0000 (17:20 +0000)]
Merge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring

9 years agoMerge pull request #5406 from cbalint13:master
Alexander Alekhin [Mon, 28 Sep 2015 12:13:54 +0000 (12:13 +0000)]
Merge pull request #5406 from cbalint13:master

9 years agoadding new flags to imread to load image reduced
Suleyman TURKMEN [Thu, 24 Sep 2015 19:51:11 +0000 (22:51 +0300)]
adding new flags to imread to load image reduced

9 years agolittle fixes and correction of a conceptual error
Kauê de Moraes Vestena [Sun, 27 Sep 2015 18:53:30 +0000 (15:53 -0300)]
little fixes and correction of a conceptual error

Previously, there's no way to the user see the found corners, i've changed that.

In a cout, are write that: "average reprojection err = "
But it isn't a "reprojection error" at all, it is a mean of each EPIPOLAR error, wich occur when the product x' * F * x is not equal to zero.
(x and x' are the same points in the right and left scene)
(the RMS that explain the average absolute reprojection error is given by the return of the stereoCalibrate() function)

At least, i think it's interesting to initialize the camera matrices before.

Thank you all for this amazing code. Apologize my weak english.

9 years agoSpeedup AGAST nonmax-suppression.
Balint Cristian [Sat, 26 Sep 2015 01:43:07 +0000 (04:43 +0300)]
Speedup AGAST nonmax-suppression.

9 years agoIPP_VERSION_X100 was changed to:
Pavel Vlasov [Fri, 25 Sep 2015 14:50:15 +0000 (17:50 +0300)]
IPP_VERSION_X100 was changed to:
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;

9 years agoSome IPP functions were encapsulated;
Pavel Vlasov [Fri, 25 Sep 2015 14:13:11 +0000 (17:13 +0300)]
Some IPP functions were encapsulated;
Minor changes to IPP implementations;

9 years agomove IPPICV binaries to GitHub opencv_3rdparty repository
Alexander Alekhin [Fri, 25 Sep 2015 13:50:50 +0000 (16:50 +0300)]
move IPPICV binaries to GitHub opencv_3rdparty repository

9 years agoMerge pull request #5391 from paroj:parser_nonempty
Alexander Alekhin [Fri, 25 Sep 2015 11:01:09 +0000 (11:01 +0000)]
Merge pull request #5391 from paroj:parser_nonempty

9 years agoMerge pull request #5393 from enesates:patch-1
Maksim Shabunin [Fri, 25 Sep 2015 07:35:47 +0000 (07:35 +0000)]
Merge pull request #5393 from enesates:patch-1

9 years agofix wrong parsing of values containing '='
Pavel Rojtberg [Wed, 23 Sep 2015 14:20:07 +0000 (16:20 +0200)]
fix wrong parsing of values containing '='

fixes #5074

9 years agoMerge pull request #5295 from LorenaGdL:ml-svm_tutorials
Alexander Alekhin [Thu, 24 Sep 2015 14:13:07 +0000 (14:13 +0000)]
Merge pull request #5295 from LorenaGdL:ml-svm_tutorials

9 years agofix #5264
Alexander Alekhin [Thu, 24 Sep 2015 12:56:47 +0000 (15:56 +0300)]
fix #5264

9 years agoMerge pull request #5396 from alalek:pr_5377_squashed
Alexander Alekhin [Thu, 24 Sep 2015 12:33:42 +0000 (12:33 +0000)]
Merge pull request #5396 from alalek:pr_5377_squashed

9 years agoMerge pull request #5363 from avershov:opencl-vaapi-detect
Alexander Alekhin [Thu, 24 Sep 2015 12:32:03 +0000 (12:32 +0000)]
Merge pull request #5363 from avershov:opencl-vaapi-detect

9 years agofindChessboardCorners causes crash due to out-of-bounds memory corruption.
robertxwu [Fri, 28 Aug 2015 01:14:08 +0000 (18:14 -0700)]
findChessboardCorners causes crash due to out-of-bounds memory corruption.

Refer to the following issue for detail:
https://github.com/Itseez/opencv/issues/5145

9 years agochanged device detection procedure, added resizing surface to bigger size
Alexey Ershov [Thu, 17 Sep 2015 23:25:49 +0000 (02:25 +0300)]
changed device detection procedure, added resizing surface to bigger size
removed unused context_id2; changed blur size 7x7 to 3x3; added short comments
removed unnecessary call to convertFromVASurface()
replaced dumpSurface() with writeImage()
added infile cmdline parameter, input image loaded by imread()

9 years agoCommandLineParser: add special <none> value to disallow empty strings
Pavel Rojtberg [Wed, 23 Sep 2015 10:03:44 +0000 (12:03 +0200)]
CommandLineParser: add special <none> value to disallow empty strings

some mandatory string keys like paths must not be empty. Add the special
default value `<none>` so the CommandLineParser can enforce this and
generate an according error message for us.

9 years agoXML file path correction
Enes Ateş [Wed, 23 Sep 2015 11:19:17 +0000 (13:19 +0200)]
XML file path correction

in documentation exact path is images/CameraCalibration/VID5

9 years agoMerge pull request #5382 from paroj:parserthrow
Alexander Alekhin [Wed, 23 Sep 2015 10:18:00 +0000 (10:18 +0000)]
Merge pull request #5382 from paroj:parserthrow

9 years agoMerge pull request #5379 from sturkmen72:patch-9
Alexander Alekhin [Wed, 23 Sep 2015 10:15:03 +0000 (10:15 +0000)]
Merge pull request #5379 from sturkmen72:patch-9

9 years agoenable additional CommandLineParser tests
Pavel Rojtberg [Tue, 22 Sep 2015 15:02:58 +0000 (17:02 +0200)]
enable additional CommandLineParser tests

9 years agoCommandLineParser: throw on programmer error
Pavel Rojtberg [Tue, 22 Sep 2015 10:16:09 +0000 (12:16 +0200)]
CommandLineParser: throw on programmer error

requesting a previously undeclared key is most likely an programming
error. e.g. a typo "--unused vs --unsued".
So throw in those cases.

Add an according failure testcase.

9 years agofix Android camera datarace (mCameraFrameReady)
Alexander Alekhin [Tue, 22 Sep 2015 12:35:25 +0000 (15:35 +0300)]
fix Android camera datarace (mCameraFrameReady)

9 years agocmdparser: allow empty strings
Alexander Alekhin [Tue, 22 Sep 2015 12:15:38 +0000 (15:15 +0300)]
cmdparser: allow empty strings

9 years agofix perf tests
Alexander Alekhin [Tue, 22 Sep 2015 12:02:43 +0000 (15:02 +0300)]
fix perf tests

9 years agoMerge pull request #5383 from alalek:fix_tests
Alexander Alekhin [Tue, 22 Sep 2015 12:11:22 +0000 (12:11 +0000)]
Merge pull request #5383 from alalek:fix_tests

9 years agofix perf tests
Alexander Alekhin [Tue, 22 Sep 2015 12:02:43 +0000 (15:02 +0300)]
fix perf tests

9 years agoMerge pull request #5320 from berak:lda_fix
Vadim Pisarevsky [Tue, 22 Sep 2015 10:38:46 +0000 (10:38 +0000)]
Merge pull request #5320 from berak:lda_fix

9 years agoMerge pull request #5376 from lupustr3:pvlasov/compare_16s_fix
Alexander Alekhin [Tue, 22 Sep 2015 10:19:52 +0000 (10:19 +0000)]
Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix

9 years agoFix for cmp16s condition during IPP compare type convert;
Pavel Vlasov [Mon, 21 Sep 2015 15:11:20 +0000 (18:11 +0300)]
Fix for cmp16s condition during IPP compare type convert;

9 years agoMerge pull request #5371 from Dikay900:ports_to_master
Alexander Alekhin [Mon, 21 Sep 2015 13:52:45 +0000 (13:52 +0000)]
Merge pull request #5371 from Dikay900:ports_to_master

9 years agoMerge pull request #5372 from alalek:cmd_tests
Alexander Alekhin [Mon, 21 Sep 2015 13:52:26 +0000 (13:52 +0000)]
Merge pull request #5372 from alalek:cmd_tests

9 years agoMerge pull request #5346 from art-programmer:art-programmer-patch-1
Vadim Pisarevsky [Mon, 21 Sep 2015 12:06:46 +0000 (12:06 +0000)]
Merge pull request #5346 from art-programmer:art-programmer-patch-1

9 years agoMerge pull request #5324 from mshabunin:hal-tests
Vadim Pisarevsky [Mon, 21 Sep 2015 12:04:01 +0000 (12:04 +0000)]
Merge pull request #5324 from mshabunin:hal-tests

9 years agoMerge pull request #5344 from psalvaggio:master
Vadim Pisarevsky [Mon, 21 Sep 2015 11:53:41 +0000 (11:53 +0000)]
Merge pull request #5344 from psalvaggio:master

9 years agoMerge pull request #5341 from blebo:py3compat
Alexander Alekhin [Mon, 21 Sep 2015 11:47:26 +0000 (11:47 +0000)]
Merge pull request #5341 from blebo:py3compat

9 years agoMerge pull request #5358 from StevenPuttemans:contributing_guidelines_master
Vadim Pisarevsky [Mon, 21 Sep 2015 11:45:29 +0000 (11:45 +0000)]
Merge pull request #5358 from StevenPuttemans:contributing_guidelines_master

9 years agochanges to reflect 3.0 status
Dikay900 [Sat, 19 Sep 2015 12:15:40 +0000 (14:15 +0200)]
changes to reflect 3.0 status

9 years agoOnly conflict with packages corresponding to modules that are built
Roman Donchenko [Wed, 26 Aug 2015 10:42:21 +0000 (13:42 +0300)]
Only conflict with packages corresponding to modules that are built