platform/upstream/opencv.git
8 years agoseriously improved performance of blur function, especially 3x3 and 5x5 cases (#7262)
Vadim Pisarevsky [Fri, 9 Sep 2016 19:31:02 +0000 (23:31 +0400)]
seriously improved performance of blur function, especially 3x3 and 5x5 cases (#7262)

* seriously improved performance of blur function, especially 3x3 and 5x5 cases

* trying to fix warnings and test failures

* replaced #if 0 with #if IPP_DISABLE_BLOCK

8 years agoMerge pull request #7165 from PkLab:doc_videoio
Maksim Shabunin [Fri, 9 Sep 2016 18:01:40 +0000 (18:01 +0000)]
Merge pull request #7165 from PkLab:doc_videoio

8 years agoLarge update of videoio doc and samples following mshabunin comments
PkLab.net [Wed, 24 Aug 2016 17:57:17 +0000 (19:57 +0200)]
Large update of videoio doc and samples following mshabunin comments

8 years agoMerge pull request #7259 from alalek:issue_7232
Vadim Pisarevsky [Fri, 9 Sep 2016 12:08:40 +0000 (12:08 +0000)]
Merge pull request #7259 from alalek:issue_7232

8 years agoMerge pull request #7260 from alalek:ffmpeg_windows_binaries
Vadim Pisarevsky [Fri, 9 Sep 2016 12:07:12 +0000 (12:07 +0000)]
Merge pull request #7260 from alalek:ffmpeg_windows_binaries

8 years agoffmpeg: update Windows binaries (ffmpeg 3.1.3)
Alexander Alekhin [Thu, 8 Sep 2016 16:53:39 +0000 (19:53 +0300)]
ffmpeg: update Windows binaries (ffmpeg 3.1.3)

8 years agocmake: fix libpng build on MSVS2012
Alexander Alekhin [Thu, 8 Sep 2016 16:41:11 +0000 (19:41 +0300)]
cmake: fix libpng build on MSVS2012

8 years agoMerge pull request #7171 from alalek:ocl_instrumentation
Alexander Alekhin [Thu, 8 Sep 2016 16:31:22 +0000 (16:31 +0000)]
Merge pull request #7171 from alalek:ocl_instrumentation

8 years agoMerge pull request #7257 from alalek:issue_7256
Maksim Shabunin [Thu, 8 Sep 2016 15:28:09 +0000 (15:28 +0000)]
Merge pull request #7257 from alalek:issue_7256

8 years agoMerge pull request #7213 from alalek:issue_7203
Alexander Alekhin [Thu, 8 Sep 2016 15:25:13 +0000 (15:25 +0000)]
Merge pull request #7213 from alalek:issue_7203

8 years agoviz: use ../precomp.hpp in modules/viz/src/vtk/* files
Alexander Alekhin [Thu, 8 Sep 2016 13:19:05 +0000 (16:19 +0300)]
viz: use ../precomp.hpp in modules/viz/src/vtk/* files

8 years agoinstrumentation: fix build on Linux
Alexander Alekhin [Fri, 26 Aug 2016 12:08:50 +0000 (15:08 +0300)]
instrumentation: fix build on Linux

- enable C++11
- fix macro

8 years agoinstrumentation: minor refactoring, wrap OpenCL
Alexander Alekhin [Thu, 25 Aug 2016 14:26:46 +0000 (17:26 +0300)]
instrumentation: minor refactoring, wrap OpenCL

- calculate ticksTotal instead of ticksMean
- local / global width is based on ticksTotal value
- added instrumentation for OpenCL program compilation
- added instrumentation for OpenCL kernel execution

8 years agoffmpeg: fill avg_frame_rate
Alexander Alekhin [Thu, 8 Sep 2016 11:42:01 +0000 (14:42 +0300)]
ffmpeg: fill avg_frame_rate

8 years agoffmpeg: fix get_fps()
Alexander Alekhin [Thu, 1 Sep 2016 12:31:08 +0000 (15:31 +0300)]
ffmpeg: fix get_fps()

8 years agoMerge pull request #7246 from paroj:bgfg_ocl
Alexander Alekhin [Thu, 8 Sep 2016 11:16:01 +0000 (11:16 +0000)]
Merge pull request #7246 from paroj:bgfg_ocl

8 years agoMerge pull request #7253 from Finfa811:revert_borderconstant
Alexander Alekhin [Thu, 8 Sep 2016 11:15:25 +0000 (11:15 +0000)]
Merge pull request #7253 from Finfa811:revert_borderconstant

8 years agoMerge pull request #7247 from valeriyvan:matrix
Alexander Alekhin [Thu, 8 Sep 2016 09:49:02 +0000 (09:49 +0000)]
Merge pull request #7247 from valeriyvan:matrix

8 years agoMerge pull request #7156 from sovrasov:hal_qr_decomp
Alexander Alekhin [Thu, 8 Sep 2016 09:47:52 +0000 (09:47 +0000)]
Merge pull request #7156 from sovrasov:hal_qr_decomp

8 years agoReverted BORDER_CONSTAT in stitcher.cpp
Finfa811 [Thu, 8 Sep 2016 08:49:48 +0000 (10:49 +0200)]
Reverted BORDER_CONSTAT in stitcher.cpp

Resolves #7251

8 years agoMerge pull request #7233 from tomoaki0705:featureUniversalIntrinsicFp16
Alexander Alekhin [Wed, 7 Sep 2016 14:42:46 +0000 (14:42 +0000)]
Merge pull request #7233 from tomoaki0705:featureUniversalIntrinsicFp16

8 years agoMinor fix in MatAllocator::download
Valeriy Van [Tue, 6 Sep 2016 21:39:27 +0000 (00:39 +0300)]
Minor fix in MatAllocator::download
Minor fix in MatAllocator::upload
Minor fix in MatAllocator::copy
Minor fix in setSize function
Minor fix in Mat::Mat
Minor fix in cvMatNDToMat function
Minor fix in _InputArray::getMatVector
Minor fix in _InputArray::getUMatVector
Minor fix in cv::hconcat
Minor fix in cv::vconcat
Minor fix in cv::setIdentity
Minor fix in cv::trace
Minor fix in transposeI_ template function
Minor fix in reduceC_ template function
Minor fix in sort_ template function
Minor fix in sortIdx_ template function
Minor fix in cvRange function
Minor fix in MatConstIterator::seek
Minor fix in SparseMat::create
Minor fix in SparseMat::copyTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::ptr
Minor fix in SparseMat::resizeHashTab
Fixes indentation

8 years agoBackgroundSubtractorMOG2Impl: only use OpenCL if input image is UMat
Pavel Rojtberg [Wed, 7 Sep 2016 13:48:37 +0000 (15:48 +0200)]
BackgroundSubtractorMOG2Impl: only use OpenCL if input image is UMat

8 years agoMerge pull request #7202 from valeriyvan:fixUIImageToMat
Maksim Shabunin [Tue, 6 Sep 2016 20:45:19 +0000 (20:45 +0000)]
Merge pull request #7202 from valeriyvan:fixUIImageToMat

8 years agoMerge pull request #7221 from terfendail:sepfilter_vec_kernel
Maksim Shabunin [Tue, 6 Sep 2016 20:41:28 +0000 (20:41 +0000)]
Merge pull request #7221 from terfendail:sepfilter_vec_kernel

8 years agoMerge pull request #7229 from catree:add_peopledetect_video_option
Maksim Shabunin [Tue, 6 Sep 2016 20:28:50 +0000 (20:28 +0000)]
Merge pull request #7229 from catree:add_peopledetect_video_option

8 years agoMerge pull request #7064 from DmtKats:pam
Alexander Alekhin [Tue, 6 Sep 2016 16:56:26 +0000 (16:56 +0000)]
Merge pull request #7064 from DmtKats:pam

8 years agoMerge pull request #7220 from paroj:imgproc_doxy
Maksim Shabunin [Tue, 6 Sep 2016 14:33:16 +0000 (14:33 +0000)]
Merge pull request #7220 from paroj:imgproc_doxy

8 years agoImgcodecs: Implemented simple tests for PAM format
Dimitrios Katsaros [Wed, 20 Jul 2016 13:13:39 +0000 (15:13 +0200)]
Imgcodecs: Implemented simple tests for PAM format

8 years agoImgcodecs: Fixed a bug with checkSignature in GdalDecoder
Dimitrios Katsaros [Sun, 14 Aug 2016 20:17:55 +0000 (22:17 +0200)]
Imgcodecs: Fixed a bug with checkSignature in GdalDecoder

In cases where the signaure string contains a terminating character,
the std::string member function size returns a smaller value than the
allocated string. In these cases, if you then try to use substr,
you will get an out_of_range exception. This patch remedies the problem.

8 years agoimgcodecs: Implementation of PAM encoder/decoder
Dimitrios Katsaros [Thu, 14 Jul 2016 13:27:36 +0000 (15:27 +0200)]
imgcodecs: Implementation of PAM encoder/decoder

This patch implements the PAM image format as defined at:
http://netpbm.sourceforge.net/doc/pam.html

The PAM format provides a generic means for storing 2 dimensional information.
This is useful for opencv since there are cases where data gets translated into
non standardized formats, which makes it difficult to store and load this information.

8 years agoAdd QR decomposition to HAL
Vladislav Sovrasov [Tue, 23 Aug 2016 13:35:03 +0000 (16:35 +0300)]
Add QR decomposition to HAL

8 years agoImprove canny (#7227)
mschoeneck [Mon, 5 Sep 2016 10:51:36 +0000 (12:51 +0200)]
Improve canny (#7227)

* Improve Canny by using _mm_movemask_epi8 to find next pixel magnitude greater than lower threshold. Added parallelized finalPass to Canny with variable gradients. Little changes in finalPass.

* Some things fixed

8 years agoMerge pull request #7234 from taketwo:is-continuous-gpu-mat
Alexander Alekhin [Mon, 5 Sep 2016 10:46:40 +0000 (10:46 +0000)]
Merge pull request #7234 from taketwo:is-continuous-gpu-mat

8 years agoAdd support for GpuMat in InputArray::isContinuous()
Sergey Alexandrov [Mon, 5 Sep 2016 07:27:35 +0000 (09:27 +0200)]
Add support for GpuMat in InputArray::isContinuous()

8 years agouse universal intrinsic for FP16
Tomoaki Teshima [Fri, 2 Sep 2016 12:57:46 +0000 (21:57 +0900)]
use universal intrinsic for FP16
  * use v_float16x4 (universal intrinsic) instead of raw SSE/NEON implementation
  * define v_load_f16/v_store_f16 since v_load can't be distinguished when short pointer passed
  * brush up implementation on old compiler (guard correctly)
  * add test for v_load_f16 and round trip conversion of v_float16x4
  * fix conversion error

8 years agoAdd the possibility to use a video stream with the peopledetect.cpp sample.
catree [Sun, 4 Sep 2016 02:17:15 +0000 (04:17 +0200)]
Add the possibility to use a video stream with the peopledetect.cpp sample.

Fixed video input argument.

8 years agodoxygen: imgproc - underscores should not be escaped in texttt
Pavel Rojtberg [Fri, 2 Sep 2016 10:21:08 +0000 (12:21 +0200)]
doxygen: imgproc - underscores should not be escaped in texttt

8 years agodoxygen: undistortPoints - replace matlab code by latex forumlae
Pavel Rojtberg [Fri, 2 Sep 2016 10:20:32 +0000 (12:20 +0200)]
doxygen: undistortPoints - replace matlab code by latex forumlae

8 years agoMerge pull request #7210 from mshabunin:fix-warnings
Alexander Alekhin [Fri, 2 Sep 2016 12:50:45 +0000 (12:50 +0000)]
Merge pull request #7210 from mshabunin:fix-warnings

8 years agoMerge pull request #7130 from souch55:Fixed
Alexander Alekhin [Fri, 2 Sep 2016 12:49:49 +0000 (12:49 +0000)]
Merge pull request #7130 from souch55:Fixed

8 years agoUpdated HAL interface for separable filters to address that both kernels are vectors.
Vitaly Tuzov [Fri, 2 Sep 2016 11:36:34 +0000 (14:36 +0300)]
Updated HAL interface for separable filters to address that both kernels are vectors.

8 years agoMerge pull request #7183 from mself:LMeDS_median_optimization
Alexander Alekhin [Fri, 2 Sep 2016 11:16:12 +0000 (11:16 +0000)]
Merge pull request #7183 from mself:LMeDS_median_optimization

8 years agoMerge pull request #7175 from tomoaki0705:featureIntrinsic64
Maksim Shabunin [Fri, 2 Sep 2016 10:16:44 +0000 (10:16 +0000)]
Merge pull request #7175 from tomoaki0705:featureIntrinsic64

8 years agoMerge pull request #7174 from guycook:android-libcpp
Maksim Shabunin [Fri, 2 Sep 2016 09:54:52 +0000 (09:54 +0000)]
Merge pull request #7174 from guycook:android-libcpp

8 years agoFix android libc++ build
Matthew Cook [Fri, 26 Aug 2016 03:18:35 +0000 (15:18 +1200)]
Fix android libc++ build

8 years agoMerge pull request #7212 from alalek:issue_7003
Alexander Alekhin [Thu, 1 Sep 2016 14:25:35 +0000 (14:25 +0000)]
Merge pull request #7212 from alalek:issue_7003

8 years agoFixed several GCC 5.x warnings
Maksim Shabunin [Wed, 31 Aug 2016 20:12:52 +0000 (23:12 +0300)]
Fixed several GCC 5.x warnings

8 years agocmake: update matlab path
Alexander Alekhin [Thu, 1 Sep 2016 12:17:32 +0000 (15:17 +0300)]
cmake: update matlab path

8 years agoMerge pull request #7182 from mself:two_channel_universal_intrinsics
Maksim Shabunin [Wed, 31 Aug 2016 10:11:43 +0000 (10:11 +0000)]
Merge pull request #7182 from mself:two_channel_universal_intrinsics

8 years agoMerge pull request #7205 from souch55:Fixtrans
Alexander Alekhin [Wed, 31 Aug 2016 09:51:45 +0000 (09:51 +0000)]
Merge pull request #7205 from souch55:Fixtrans

8 years agoFixed traincascade read issue
sourin [Wed, 31 Aug 2016 05:59:15 +0000 (11:29 +0530)]
Fixed traincascade read issue

8 years agoGets rid of magic constant
Valeriy Van [Tue, 30 Aug 2016 20:22:49 +0000 (23:22 +0300)]
Gets rid of magic constant

8 years agoadd 64F intrinsic in HAL NEON
Tomoaki Teshima [Tue, 30 Aug 2016 08:21:02 +0000 (17:21 +0900)]
add 64F intrinsic in HAL NEON
  * use universal intrinsic for accumulate series using float/double
  * accumulate, accumulateSquare, accumulateProduct and accumulateWeighted
  * add v_cvt_f64_high in both SSE/NEON
  * add test for conversion v_cvt_f64_high in test_intrin.cpp
  * improve some existing universal intrinsic by using new instructions in Aarch64
  * add workaround for Android build in intrin_neon.hpp

8 years agoMerge pull request #7170 from alalek:fix_build
Alexander Alekhin [Mon, 29 Aug 2016 10:15:58 +0000 (10:15 +0000)]
Merge pull request #7170 from alalek:fix_build

8 years agoMerge pull request #7177 from alalek:msvs_layout
Alexander Alekhin [Mon, 29 Aug 2016 09:36:49 +0000 (09:36 +0000)]
Merge pull request #7177 from alalek:msvs_layout

8 years agoMerge pull request #7140 from Asalle:fix-7136-Bounding_Box_explanation
Maksim Shabunin [Mon, 29 Aug 2016 08:42:02 +0000 (08:42 +0000)]
Merge pull request #7140 from Asalle:fix-7136-Bounding_Box_explanation

8 years agoMerge pull request #7180 from mrquorr:add_dcm_test
Maksim Shabunin [Mon, 29 Aug 2016 08:40:02 +0000 (08:40 +0000)]
Merge pull request #7180 from mrquorr:add_dcm_test

8 years agoImprove perfomance of median calculation in LMedS algorithm
Matthew Self [Sat, 27 Aug 2016 03:39:38 +0000 (20:39 -0700)]
Improve perfomance of median calculation in LMedS algorithm

* Use `nth_element()` to find the median instead of `sort()` in `LMeDSPointSetRegistrator::run()`

* Improves performance of this part of LMedS from `n log(n)` to `n` by avoiding doing a full sort.

* Makes LMedS 2x faster for 100 points, 4x faster for 5,000 points in `EstimateAffine2D()`.

* LMedS is now never more than 2x slower than RANSAC and is faster in some cases.

8 years ago2-channel interleaved load/store for universal intrinsics (float only)
Matthew Self [Wed, 17 Aug 2016 07:17:45 +0000 (00:17 -0700)]
2-channel interleaved load/store for universal intrinsics (float only)

* Added 2-channel ops to match existing 3-channel and 4-channel ops

* v_load_deinterleave() and v_store_interleave()

* Implements float32x4 only on SSE (but all types on NEON and CPP)

* Includes tests

* Will be used to vectorize 2D functions, such as estimateAffine2D()

8 years agoadd explanation to the Bounding Box and Circles tutorial
Asal Mirzaieva [Fri, 19 Aug 2016 10:48:56 +0000 (13:48 +0300)]
add explanation to the Bounding Box and Circles tutorial

 - also some minor changes to the respective sample cpp file

8 years agotest added, only if HAVE_GDCM is on
mrquorr [Fri, 12 Aug 2016 05:14:01 +0000 (00:14 -0500)]
test added, only if HAVE_GDCM is on

8 years agoadd 2 extra methods to ml::TrainData (#7169)
Vadim Pisarevsky [Fri, 26 Aug 2016 12:25:46 +0000 (16:25 +0400)]
add 2 extra methods to ml::TrainData (#7169)

* expose 2 extra methods from ml::TrainData: getNames() and getVarSymbolFlags(). The first one returns text labels from CSV (if the data has been loaded from CSV); the second one returns a matrix of boolean values; its n-th element is 1 iff the corresponding column in the CSV uses symbolic names, not numbers.

* check that the dynamic_cast succeeds

8 years agoAdd Grana's connected components algorithm for 8-way connectivity. (#6823)
Vadim Pisarevsky [Fri, 26 Aug 2016 12:01:00 +0000 (16:01 +0400)]
Add Grana's connected components algorithm for 8-way connectivity. (#6823)

* Add Grana's connected components algorithm for 8-way connectivity. That algorithm is faster than Wu's one (currently implemented in opencv). For more details see https://github.com/prittt/YACCLAB.

* New functions signature and distance transform compatibility

* Add tests to imgproc/test/test_connectedcomponents.cpp

* Change of test_connectedcomponents.cpp for c++98 support

8 years agoMerge pull request #7158 from sturkmen72:documentation_fix
Vadim Pisarevsky [Fri, 26 Aug 2016 11:40:19 +0000 (11:40 +0000)]
Merge pull request #7158 from sturkmen72:documentation_fix

8 years agoMerge pull request #7149 from Cartucho:patch-1
Vadim Pisarevsky [Fri, 26 Aug 2016 11:39:51 +0000 (11:39 +0000)]
Merge pull request #7149 from Cartucho:patch-1

8 years agoMerge pull request #7093 from mshabunin:openvx_hal
Vadim Pisarevsky [Fri, 26 Aug 2016 11:22:52 +0000 (11:22 +0000)]
Merge pull request #7093 from mshabunin:openvx_hal

8 years agoMerge pull request #7167 from alalek:modules_deps
Vadim Pisarevsky [Fri, 26 Aug 2016 11:16:45 +0000 (11:16 +0000)]
Merge pull request #7167 from alalek:modules_deps

8 years agoMerge pull request #7172 from valeriyvan:iosfixes
Vadim Pisarevsky [Fri, 26 Aug 2016 11:11:49 +0000 (11:11 +0000)]
Merge pull request #7172 from valeriyvan:iosfixes

8 years agocmake: minimize MSVS projects layout
Alexander Alekhin [Fri, 26 Aug 2016 10:33:47 +0000 (13:33 +0300)]
cmake: minimize MSVS projects layout

Also put "object" targets to off by default (they doesn't work well)

8 years agoUnifies Obj-C property attributes changing retain to strong
Valeriy Van [Thu, 25 Aug 2016 18:40:16 +0000 (21:40 +0300)]
Unifies Obj-C property attributes changing retain to strong

strong and retain are synonymous but using strong along with  obsolete synonym retain in one file is negligent

8 years agofix Win build, change default WINNT macro to WinXP
Alexander Alekhin [Thu, 25 Aug 2016 13:21:52 +0000 (16:21 +0300)]
fix Win build, change default WINNT macro to WinXP

Returning to Win2k value is possible via this CMake option:

    cmake -DOPENCV_EXTRA_FLAGS="/D_WIN32_WINNT=0x0500" ...

8 years agoOpenVX HAL
Maksim Shabunin [Thu, 25 Aug 2016 13:08:35 +0000 (16:08 +0300)]
OpenVX HAL

8 years agoMerge pull request #7162 from kurenai:update_png
Alexander Alekhin [Thu, 25 Aug 2016 13:00:47 +0000 (13:00 +0000)]
Merge pull request #7162 from kurenai:update_png

8 years agofix modules deps
Alexander Alekhin [Thu, 25 Aug 2016 11:57:12 +0000 (14:57 +0300)]
fix modules deps

8 years agoMerge pull request #7166 from tomoaki0705:brushUpFp16
Alexander Alekhin [Thu, 25 Aug 2016 11:49:23 +0000 (11:49 +0000)]
Merge pull request #7166 from tomoaki0705:brushUpFp16

8 years agoUpdate libpng to 1.6.24
kurenai [Thu, 25 Aug 2016 01:48:46 +0000 (09:48 +0800)]
Update libpng to 1.6.24
Enable SSE optimization

8 years agobrush up fp16 implementation
Tomoaki Teshima [Wed, 24 Aug 2016 09:32:13 +0000 (18:32 +0900)]
brush up fp16 implementation
  * DRY
  * switch to Cv32suf and remove fp32Int32
  * add Cv16suf

8 years agoMerge pull request #7088 from wiryls:FileStorageJSON
Vadim Pisarevsky [Wed, 24 Aug 2016 16:48:58 +0000 (16:48 +0000)]
Merge pull request #7088 from wiryls:FileStorageJSON

8 years agoAdd two tests.
MYLS [Wed, 24 Aug 2016 09:01:57 +0000 (17:01 +0800)]
Add two tests.

- one test for type_id;
- another for comments in JSON;

8 years agoMerge pull request #7157 from valeriyvan/patch-1
Vadim Pisarevsky [Tue, 23 Aug 2016 20:33:06 +0000 (00:33 +0400)]
Merge pull request #7157 from valeriyvan/patch-1

Fixes spelling in comment

8 years agoMake Up
Suleyman TURKMEN [Tue, 23 Aug 2016 17:57:20 +0000 (20:57 +0300)]
Make Up

8 years agoFixes spelling in comment
Valeriy Van [Tue, 23 Aug 2016 19:04:41 +0000 (22:04 +0300)]
Fixes spelling in comment

8 years agoMerge pull request #7141 from lupustr3:pvlasov/instrumentation_extension
Alexander Alekhin [Tue, 23 Aug 2016 16:48:25 +0000 (16:48 +0000)]
Merge pull request #7141 from lupustr3:pvlasov/instrumentation_extension

8 years agoMerge pull request #7150 from mpkh:patch-1
Alexander Alekhin [Mon, 22 Aug 2016 15:11:18 +0000 (15:11 +0000)]
Merge pull request #7150 from mpkh:patch-1

8 years agofix building on FreeBSD
mpkh [Mon, 22 Aug 2016 13:17:06 +0000 (17:17 +0400)]
fix building on FreeBSD

resolve undeclared identifier close error

8 years agoMerge pull request #6937 from catree:add_peopledetect_sample
Vadim Pisarevsky [Mon, 22 Aug 2016 12:48:41 +0000 (12:48 +0000)]
Merge pull request #6937 from catree:add_peopledetect_sample

8 years agoMerge pull request #7142 from alalek:fix_hls_test_check
Vadim Pisarevsky [Mon, 22 Aug 2016 12:26:54 +0000 (12:26 +0000)]
Merge pull request #7142 from alalek:fix_hls_test_check

8 years ago Update hull_demo.cpp
Cartucho [Mon, 22 Aug 2016 11:45:24 +0000 (13:45 +0200)]
 Update hull_demo.cpp

The Mat "src_copy" is never used.

8 years agoMerge pull request #7145 from Bleach665:vs2010_fix
Alexander Alekhin [Sat, 20 Aug 2016 21:51:47 +0000 (21:51 +0000)]
Merge pull request #7145 from Bleach665:vs2010_fix

8 years agocasting to fix vs2010 compile error
Bleach [Sat, 20 Aug 2016 13:29:15 +0000 (16:29 +0300)]
casting to fix vs2010 compile error

8 years agoMerge pull request #7122 from haikusw:UIImageAlphaToMatFix
Vadim Pisarevsky [Sat, 20 Aug 2016 10:38:35 +0000 (10:38 +0000)]
Merge pull request #7122 from haikusw:UIImageAlphaToMatFix

8 years agoInstrumentation for OpenCV API regions and IPP functions;
Pavel Vlasov [Thu, 18 Aug 2016 06:53:00 +0000 (09:53 +0300)]
Instrumentation for OpenCV API regions and IPP functions;

8 years agoimgproc: fix accuracy check for HLS cvtColor
Alexander Alekhin [Fri, 19 Aug 2016 14:30:57 +0000 (17:30 +0300)]
imgproc: fix accuracy check for HLS cvtColor

8 years agoMerge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove
Alexander Alekhin [Fri, 19 Aug 2016 13:23:47 +0000 (13:23 +0000)]
Merge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove

8 years agoOutdated ICV restrictions were removed;
Pavel Vlasov [Wed, 17 Aug 2016 07:25:19 +0000 (10:25 +0300)]
Outdated ICV restrictions were removed;

8 years agoMerge pull request #7108 from K-Shinotsuka:issue16
Vadim Pisarevsky [Fri, 19 Aug 2016 08:10:51 +0000 (08:10 +0000)]
Merge pull request #7108 from K-Shinotsuka:issue16

8 years agoMerge pull request #7101 from lupustr3:pvlasov/instrumentation
Alexander Alekhin [Thu, 18 Aug 2016 14:56:40 +0000 (14:56 +0000)]
Merge pull request #7101 from lupustr3:pvlasov/instrumentation

8 years agoMerge pull request #7129 from paroj:mousecallback-dry-code
Alexander Alekhin [Thu, 18 Aug 2016 14:12:45 +0000 (14:12 +0000)]
Merge pull request #7129 from paroj:mousecallback-dry-code

8 years agoMerge pull request #6945 from sturkmen72:update_documentation
Vadim Pisarevsky [Thu, 18 Aug 2016 13:23:17 +0000 (13:23 +0000)]
Merge pull request #6945 from sturkmen72:update_documentation