platform/upstream/opencv.git
9 years agorename CudaMem -> HostMem to better reflect its purpose
Vladislav Vinogradov [Fri, 19 Dec 2014 10:46:28 +0000 (13:46 +0300)]
rename CudaMem -> HostMem to better reflect its purpose

9 years agomove allocMatFromBuf function to farneback.cpp:
Vladislav Vinogradov [Thu, 18 Dec 2014 15:02:58 +0000 (18:02 +0300)]
move allocMatFromBuf function to farneback.cpp:

* it is the only place, where it is used
* no need to make this function public

9 years agoMerge pull request #3529 from jet47:fix-linux-install
Vadim Pisarevsky [Tue, 23 Dec 2014 13:38:23 +0000 (13:38 +0000)]
Merge pull request #3529 from jet47:fix-linux-install

9 years agoMerge pull request #3536 from mshabunin:doxygen-intro
Vadim Pisarevsky [Tue, 23 Dec 2014 13:36:40 +0000 (13:36 +0000)]
Merge pull request #3536 from mshabunin:doxygen-intro

9 years agoFixed some mistakes
Maksim Shabunin [Mon, 22 Dec 2014 14:21:37 +0000 (17:21 +0300)]
Fixed some mistakes

9 years agoTutorial: documenting OpenCV
Maksim Shabunin [Tue, 9 Dec 2014 15:45:36 +0000 (18:45 +0300)]
Tutorial: documenting OpenCV

9 years agoMerge pull request #3513 from mshabunin:compat-30
Vadim Pisarevsky [Mon, 22 Dec 2014 11:58:01 +0000 (11:58 +0000)]
Merge pull request #3513 from mshabunin:compat-30

9 years agoMerge pull request #3520 from JoeHowse:master
Vadim Pisarevsky [Mon, 22 Dec 2014 11:14:29 +0000 (11:14 +0000)]
Merge pull request #3520 from JoeHowse:master

9 years agoMerge pull request #3524 from jet47:fix-cuda-warnings
Vadim Pisarevsky [Mon, 22 Dec 2014 10:58:07 +0000 (10:58 +0000)]
Merge pull request #3524 from jet47:fix-cuda-warnings

9 years agoMerge pull request #3525 from jet47:fix-cudev-tests
Vadim Pisarevsky [Mon, 22 Dec 2014 10:57:06 +0000 (10:57 +0000)]
Merge pull request #3525 from jet47:fix-cudev-tests

9 years agoMerge pull request #3490 from oresths:symmcolumnsmall_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:44:47 +0000 (10:44 +0000)]
Merge pull request #3490 from oresths:symmcolumnsmall_fix

9 years agoMerge pull request #3512 from vins31:OpenNi2_AsusXtion
Vadim Pisarevsky [Mon, 22 Dec 2014 10:39:42 +0000 (10:39 +0000)]
Merge pull request #3512 from vins31:OpenNi2_AsusXtion

9 years agoMerge pull request #3499 from StevenPuttemans:fix_2432
Vadim Pisarevsky [Mon, 22 Dec 2014 10:29:31 +0000 (10:29 +0000)]
Merge pull request #3499 from StevenPuttemans:fix_2432

9 years agoMerge pull request #3510 from boaz001:feature-4057
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:33 +0000 (10:27 +0000)]
Merge pull request #3510 from boaz001:feature-4057

9 years agoMerge pull request #3516 from ana-GT:openni2_defaultMode
Vadim Pisarevsky [Mon, 22 Dec 2014 10:26:30 +0000 (10:26 +0000)]
Merge pull request #3516 from ana-GT:openni2_defaultMode

9 years agoMerge pull request #3518 from wangyan42164:ocl_cascade_detect
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:47 +0000 (10:25 +0000)]
Merge pull request #3518 from wangyan42164:ocl_cascade_detect

9 years agoMerge pull request #3519 from fvgoto:patch-1
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:00 +0000 (10:25 +0000)]
Merge pull request #3519 from fvgoto:patch-1

9 years agoMerge pull request #3528 from ilya-lavrenov:update_android_cmake
Vadim Pisarevsky [Mon, 22 Dec 2014 10:22:19 +0000 (10:22 +0000)]
Merge pull request #3528 from ilya-lavrenov:update_android_cmake

9 years agoincrease epsilons for tests due to different optimizations (IPP vs CUDA, float vs...
Vladislav Vinogradov [Thu, 18 Dec 2014 08:37:26 +0000 (11:37 +0300)]
increase epsilons for tests due to different optimizations (IPP vs CUDA, float vs double)

9 years agoupdate cudev color conversions according to the latest changes in CPU code
Vladislav Vinogradov [Thu, 18 Dec 2014 08:36:43 +0000 (11:36 +0300)]
update cudev color conversions according to the latest changes in CPU code

9 years agodisable -Wshadow warning for CUDA modules:
Vladislav Vinogradov [Thu, 18 Dec 2014 08:35:45 +0000 (11:35 +0300)]
disable -Wshadow warning for CUDA modules:

it is generated by CUDA headers and we can't fix it

9 years agoIncluded c-headers for better 2.4 compatibility
Maksim Shabunin [Thu, 18 Dec 2014 14:56:24 +0000 (17:56 +0300)]
Included c-headers for better 2.4 compatibility

9 years agoremove opencv_testing.sh installation to /etc/profile.d/
Vladislav Vinogradov [Fri, 12 Dec 2014 15:42:15 +0000 (18:42 +0300)]
remove opencv_testing.sh installation to /etc/profile.d/

opencv_run_all_tests_unix.sh already exports OPENCV_TEST_DATA_PATH

9 years agoupdate android.toolchain.cmake
Ilya Lavrenov [Thu, 18 Dec 2014 16:31:10 +0000 (19:31 +0300)]
update android.toolchain.cmake

9 years agoMerge pull request #3517 from wangyan42164:ocl_denoising_2
Vadim Pisarevsky [Thu, 18 Dec 2014 14:50:13 +0000 (14:50 +0000)]
Merge pull request #3517 from wangyan42164:ocl_denoising_2

9 years agoFor Java compatibility, avoiding explicit pseudonym in enum
Joe Howse [Wed, 17 Dec 2014 01:37:14 +0000 (21:37 -0400)]
For Java compatibility, avoiding explicit pseudonym in enum

9 years agoAllow BGR, RGB, or gray capture via libv4l
Joe Howse [Wed, 17 Dec 2014 00:07:37 +0000 (20:07 -0400)]
Allow BGR, RGB, or gray capture via libv4l

9 years agofix obvious copy+paste typo in computeDistance()
Florian Verdet [Tue, 16 Dec 2014 11:46:07 +0000 (12:46 +0100)]
fix obvious copy+paste typo in computeDistance()

(with this else-branch, argument contour2 would not be used at all)

9 years agoUse preprocessor for constant values in OpenCL kernel instead of
Yan Wang [Tue, 16 Dec 2014 08:21:05 +0000 (16:21 +0800)]
Use preprocessor for constant values in OpenCL kernel instead of
the parameter variable.

It could improve the performance of
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*.
Especially,
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/15
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/16
could be improved about 2% in Intel platform.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove unnecessary local variable "size".
Yan Wang [Tue, 16 Dec 2014 06:25:24 +0000 (14:25 +0800)]
Remove unnecessary local variable "size".

It should also be better for optimizing when compiling kernel.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoChanged CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise...
Ana Huaman Quispe [Mon, 15 Dec 2014 23:16:25 +0000 (18:16 -0500)]
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set

9 years agoMerge pull request #3491 from mshabunin:ios-extra-world
Vadim Pisarevsky [Mon, 15 Dec 2014 18:07:09 +0000 (18:07 +0000)]
Merge pull request #3491 from mshabunin:ios-extra-world

9 years agoMerge pull request #3473 from TobyWanKenobi:master
Vadim Pisarevsky [Mon, 15 Dec 2014 18:04:01 +0000 (18:04 +0000)]
Merge pull request #3473 from TobyWanKenobi:master

9 years agoMerge pull request #3448 from Ashod:highgui_trackbar_improvements
Vadim Pisarevsky [Mon, 15 Dec 2014 18:03:01 +0000 (18:03 +0000)]
Merge pull request #3448 from Ashod:highgui_trackbar_improvements

9 years agofix documentation bug 2432
StevenPuttemans [Wed, 10 Dec 2014 12:41:22 +0000 (13:41 +0100)]
fix documentation bug 2432

9 years agoAdded better OpenNI2 support to the Asus Xtion and Occipital Structure
vincentweb [Sun, 14 Dec 2014 19:52:24 +0000 (20:52 +0100)]
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
sensors which do not have image generators.

9 years agoadd option to link to dynamic IPP libraries
Boaz Stolk [Fri, 12 Dec 2014 13:21:47 +0000 (14:21 +0100)]
add option to link to dynamic IPP libraries

9 years agoMerge pull request #3495 from taka-no-me:fix_android_arm64
Vadim Pisarevsky [Tue, 9 Dec 2014 14:12:22 +0000 (14:12 +0000)]
Merge pull request #3495 from taka-no-me:fix_android_arm64

9 years agoMerge pull request #3479 from mshabunin:doxygen-tutorials
Vadim Pisarevsky [Tue, 9 Dec 2014 14:06:23 +0000 (14:06 +0000)]
Merge pull request #3479 from mshabunin:doxygen-tutorials

9 years agoMerge pull request #3492 from Dmitry-Me:reduceVariablesScope1
Vadim Pisarevsky [Tue, 9 Dec 2014 14:05:35 +0000 (14:05 +0000)]
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1

9 years agoFix build for Android arm64-v8a
Andrey Kamaev [Tue, 9 Dec 2014 09:06:56 +0000 (12:06 +0300)]
Fix build for Android arm64-v8a

9 years agoMerge pull request #3486 from Chuanbo-Weng:repeat-perf
Alexander Alekhin [Mon, 8 Dec 2014 15:49:21 +0000 (15:49 +0000)]
Merge pull request #3486 from Chuanbo-Weng:repeat-perf

9 years agoReduce variables scope, move declaration to first use point
Dmitry-Me [Mon, 8 Dec 2014 15:21:17 +0000 (18:21 +0300)]
Reduce variables scope, move declaration to first use point

9 years agoRemoved "FORMAT_XML" to generalize format
TobyWanKenobi [Mon, 8 Dec 2014 08:21:55 +0000 (09:21 +0100)]
Removed "FORMAT_XML" to generalize format

Removed the "FileStorage::FORMAT_XML" to generalize format of the String
model.

9 years agoFix SymmColumnSmallVec_32s16s SSE code
orestis [Sat, 6 Dec 2014 17:53:07 +0000 (19:53 +0200)]
Fix SymmColumnSmallVec_32s16s SSE code
Specifically, in general antisymmetric case src[-1] (S0) should be
subtracted from from src[1] (S2), and not the opposite.

9 years agohighgui: Support to change trackbar count in setTrackbarPos and replaced deprecated...
Ashod Nakashian [Sat, 27 Sep 2014 21:27:04 +0000 (17:27 -0400)]
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.

9 years agoMerge pull request #3487 from taka-no-me:ctrl_s_gtk
Vadim Pisarevsky [Sat, 6 Dec 2014 10:04:22 +0000 (10:04 +0000)]
Merge pull request #3487 from taka-no-me:ctrl_s_gtk

9 years agoMerge pull request #3472 from Dmitry-Me:preventDivByZero
Vadim Pisarevsky [Sat, 6 Dec 2014 08:09:01 +0000 (08:09 +0000)]
Merge pull request #3472 from Dmitry-Me:preventDivByZero

9 years agoMerge pull request #3475 from fhsm:master
Vadim Pisarevsky [Sat, 6 Dec 2014 08:08:44 +0000 (08:08 +0000)]
Merge pull request #3475 from fhsm:master

9 years agoMerge pull request #3478 from akarsakov:rect_fix_typo
Vadim Pisarevsky [Sat, 6 Dec 2014 08:08:27 +0000 (08:08 +0000)]
Merge pull request #3478 from akarsakov:rect_fix_typo

9 years agoMerge pull request #3481 from mshabunin:python-test
Vadim Pisarevsky [Sat, 6 Dec 2014 08:07:39 +0000 (08:07 +0000)]
Merge pull request #3481 from mshabunin:python-test

9 years agoBuild separate world-like iOS framework for contrib
Maksim Shabunin [Fri, 5 Dec 2014 14:48:28 +0000 (17:48 +0300)]
Build separate world-like iOS framework for contrib

9 years agoMerge pull request #3483 from wangyan42164:ocl_orb_improve
Alexander Alekhin [Fri, 5 Dec 2014 12:55:54 +0000 (12:55 +0000)]
Merge pull request #3483 from wangyan42164:ocl_orb_improve

9 years agoMerge pull request #3482 from wangyan42164:ocl_brute_match_improve
Alexander Alekhin [Fri, 5 Dec 2014 12:55:29 +0000 (12:55 +0000)]
Merge pull request #3482 from wangyan42164:ocl_brute_match_improve

9 years agoFixed whitespace warnings in new tutorials
Maksim Shabunin [Fri, 5 Dec 2014 12:33:53 +0000 (15:33 +0300)]
Fixed whitespace warnings in new tutorials

9 years agoMake Ctrl+S open save dialog on Gtk backend
Andrey Kamaev [Fri, 5 Dec 2014 11:53:19 +0000 (14:53 +0300)]
Make Ctrl+S open save dialog on Gtk backend

9 years agoIt turns opengl gheck is not needed for win ctrl+s
Andrey Kamaev [Fri, 5 Dec 2014 11:06:01 +0000 (14:06 +0300)]
It turns opengl gheck is not needed for win ctrl+s

9 years agoUse sincos instead of sin and cos.
Yan Wang [Thu, 4 Dec 2014 07:48:23 +0000 (15:48 +0800)]
Use sincos instead of sin and cos.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove unnecesary operations and calculations in loop body.
Yan Wang [Thu, 4 Dec 2014 06:35:54 +0000 (14:35 +0800)]
Remove unnecesary operations and calculations in loop body.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agoRemove unnecessary kercn limitation of 4.
Chuanbo Weng [Thu, 4 Dec 2014 03:15:13 +0000 (11:15 +0800)]
Remove unnecessary kercn limitation of 4.

When accessing global memory by DWORD4, memory bandwidth
can be fully utilized on Intel platform. This patch will
make more image format(e.g. 8UC4) be processed in DWORD4
by work-item. After applying this patch, 3 subcase of
./opencv_perf_core --gtest_filter=OCL_RepeatFixture_Repeat.Repeat/*
can be speedup on HD4000 graphics card with Beignet:
OCL_RepeatFixture_Repeat.Repeat/2, 64% improvement.
OCL_RepeatFixture_Repeat.Repeat/6, 50% improvement.
OCL_RepeatFixture_Repeat.Repeat/8, 56% improvement.

Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
9 years agoRe-edition of documentation
TobyWanKenobi [Wed, 3 Dec 2014 16:13:11 +0000 (17:13 +0100)]
Re-edition of documentation

Re-edited the documentation again.

9 years agoPython test: added options to provide local data path
Maksim Shabunin [Wed, 3 Dec 2014 15:12:01 +0000 (18:12 +0300)]
Python test: added options to provide local data path

9 years agoRe-editing Documentation
TobyWanKenobi [Wed, 3 Dec 2014 14:54:25 +0000 (15:54 +0100)]
Re-editing Documentation

Attempting to re-editing the documentation, to satisfy buildbot error
status.

9 years agoChanging tabs to spaces.
TobyWanKenobi [Wed, 3 Dec 2014 14:40:12 +0000 (15:40 +0100)]
Changing tabs to spaces.

Edited previous code to change tabs into spaces.

9 years agoFixed typo in description of Rect operations
Alexander Karsakov [Wed, 3 Dec 2014 13:01:03 +0000 (16:01 +0300)]
Fixed typo in description of Rect operations

9 years agoWhite space and spelling in meanshift tutorial
fhsm [Tue, 2 Dec 2014 17:46:05 +0000 (12:46 -0500)]
White space and spelling in meanshift tutorial

Removed a leading whitespace from a parenthetical comment and corrected the spelling of "maybe"

9 years agoAdd method in StatModel class, to load from String
TobyWanKenobi [Tue, 2 Dec 2014 14:15:06 +0000 (15:15 +0100)]
Add method in StatModel class, to load from String

Added a method "loadFromString" which is based on the "load" one. It
allow to directly pass the XML string which can be usefull and faster
when you have a huge file in a variable.

9 years agoDocumentation: removed mention of Mat(IplImage*) constructor
Maksim Shabunin [Tue, 2 Dec 2014 12:15:10 +0000 (15:15 +0300)]
Documentation: removed mention of Mat(IplImage*) constructor

9 years agoPrevent division by zero
Dmitry-Me [Tue, 2 Dec 2014 11:44:09 +0000 (14:44 +0300)]
Prevent division by zero

9 years agoMerge pull request #3443 from HelenWong:bug3363Fix
Vadim Pisarevsky [Tue, 2 Dec 2014 09:14:36 +0000 (09:14 +0000)]
Merge pull request #3443 from HelenWong:bug3363Fix

9 years agoMerge pull request #3453 from mshabunin:doxygen-others
Vadim Pisarevsky [Tue, 2 Dec 2014 09:05:32 +0000 (09:05 +0000)]
Merge pull request #3453 from mshabunin:doxygen-others

9 years agoMerge pull request #3463 from Dikay900:fix_sample_video_writer
Vadim Pisarevsky [Tue, 2 Dec 2014 09:04:27 +0000 (09:04 +0000)]
Merge pull request #3463 from Dikay900:fix_sample_video_writer

9 years agoMerge pull request #3469 from a-wi:Fill_ellipse_arc_v3
Vadim Pisarevsky [Tue, 2 Dec 2014 09:03:52 +0000 (09:03 +0000)]
Merge pull request #3469 from a-wi:Fill_ellipse_arc_v3

9 years agoMerge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode
Vadim Pisarevsky [Tue, 2 Dec 2014 09:00:59 +0000 (09:00 +0000)]
Merge pull request #3470 from Dmitry-Me:simplifyOverengineeredCode

9 years agoDoxygen tutorials: support contrib, some minor changes
Maksim Shabunin [Mon, 1 Dec 2014 16:22:04 +0000 (19:22 +0300)]
Doxygen tutorials: support contrib, some minor changes

9 years agoSimplify overengineered code
Dmitry-Me [Mon, 1 Dec 2014 14:58:06 +0000 (17:58 +0300)]
Simplify overengineered code

9 years agoUser guide converted to doxygen
Maksim Shabunin [Mon, 1 Dec 2014 13:40:06 +0000 (16:40 +0300)]
User guide converted to doxygen

9 years agoFix determining bounding box of the edge collection in FillEdgeCollection().
Artur Wieczorek [Mon, 1 Dec 2014 13:30:05 +0000 (14:30 +0100)]
Fix determining bounding box of the edge collection in FillEdgeCollection().

There is necessary to account also x-coordinate of the end of the edge when determining bounding box of the edge collection.

9 years agoDoxygen tutorials: python final edits
Maksim Shabunin [Mon, 1 Dec 2014 12:46:05 +0000 (15:46 +0300)]
Doxygen tutorials: python final edits

9 years agoDoxygen tutorials: python basic
Maksim Shabunin [Fri, 28 Nov 2014 14:18:32 +0000 (17:18 +0300)]
Doxygen tutorials: python basic

9 years agoDoxygen tutorials: cpp done
Maksim Shabunin [Fri, 28 Nov 2014 13:21:28 +0000 (16:21 +0300)]
Doxygen tutorials: cpp done

9 years agoDoxygen tutorials: warnings cleared
Maksim Shabunin [Thu, 27 Nov 2014 16:54:13 +0000 (19:54 +0300)]
Doxygen tutorials: warnings cleared

9 years agoDoxygen tutorials: basic structure
Maksim Shabunin [Thu, 27 Nov 2014 12:39:05 +0000 (15:39 +0300)]
Doxygen tutorials: basic structure

9 years agoDoxygen tutorials: some fixes in RST-docs
Maksim Shabunin [Thu, 27 Nov 2014 10:23:24 +0000 (13:23 +0300)]
Doxygen tutorials: some fixes in RST-docs

9 years agoDoxygen documentation: BiB references and fixes
Maksim Shabunin [Wed, 26 Nov 2014 11:21:08 +0000 (14:21 +0300)]
Doxygen documentation: BiB references and fixes

9 years agoDoxygen documentation: more fixes and cleanups
Maksim Shabunin [Fri, 21 Nov 2014 08:28:14 +0000 (11:28 +0300)]
Doxygen documentation: more fixes and cleanups

9 years agoDoxygen documentation: mathbbm support
Maksim Shabunin [Fri, 21 Nov 2014 08:27:50 +0000 (11:27 +0300)]
Doxygen documentation: mathbbm support

9 years agoDoxygen documentation: cuda submodules reorganized
Maksim Shabunin [Thu, 20 Nov 2014 15:10:59 +0000 (18:10 +0300)]
Doxygen documentation: cuda submodules reorganized

9 years agoDoxygen documentation: viz
Maksim Shabunin [Thu, 20 Nov 2014 15:02:44 +0000 (18:02 +0300)]
Doxygen documentation: viz

9 years agoDoxygen documentation: shape, superres, videostab
Maksim Shabunin [Thu, 20 Nov 2014 14:08:58 +0000 (17:08 +0300)]
Doxygen documentation: shape, superres, videostab

9 years agoDoxygen documentation: cuda
Maksim Shabunin [Thu, 20 Nov 2014 13:42:06 +0000 (16:42 +0300)]
Doxygen documentation: cuda

9 years agoDoxygen documentation: flann, photo and stitching modules
Maksim Shabunin [Wed, 19 Nov 2014 16:08:03 +0000 (19:08 +0300)]
Doxygen documentation: flann, photo and stitching modules

9 years agoDoxygen doucmentation: ml module
Maksim Shabunin [Wed, 19 Nov 2014 14:55:13 +0000 (17:55 +0300)]
Doxygen doucmentation: ml module

9 years agoDoxygen documentation: calib3d and features2d modules
Maksim Shabunin [Wed, 19 Nov 2014 13:13:41 +0000 (16:13 +0300)]
Doxygen documentation: calib3d and features2d modules

9 years agoDoxygen documentation for: highgui, video, imgcodecs and videoio
Maksim Shabunin [Wed, 19 Nov 2014 08:29:31 +0000 (11:29 +0300)]
Doxygen documentation for: highgui, video, imgcodecs and videoio

9 years agoMerge pull request #3428 from 23pointsNorth:patch-6
Vadim Pisarevsky [Mon, 1 Dec 2014 10:45:31 +0000 (10:45 +0000)]
Merge pull request #3428 from 23pointsNorth:patch-6

9 years agoMerge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation
Vadim Pisarevsky [Mon, 1 Dec 2014 10:43:43 +0000 (10:43 +0000)]
Merge pull request #3452 from Dmitry-Me:fixIncorrectSizeComputation

9 years agoMerge pull request #3426 from mshabunin:doxygen-imgproc
Vadim Pisarevsky [Mon, 1 Dec 2014 10:43:13 +0000 (10:43 +0000)]
Merge pull request #3426 from mshabunin:doxygen-imgproc

9 years agoMerge pull request #3446 from pokeefe:fix-compilation-without-videoio
Vadim Pisarevsky [Mon, 1 Dec 2014 10:41:34 +0000 (10:41 +0000)]
Merge pull request #3446 from pokeefe:fix-compilation-without-videoio

9 years agoMerge pull request #3467 from Dikay900:fix_gpu_surf_perf_test_cpu_part
Vadim Pisarevsky [Mon, 1 Dec 2014 10:37:40 +0000 (10:37 +0000)]
Merge pull request #3467 from Dikay900:fix_gpu_surf_perf_test_cpu_part