profile/ivi/opencv.git
10 years agoremoved gpu module from OPENCV2_BASE_MODULES
Vladislav Vinogradov [Wed, 24 Jul 2013 07:59:41 +0000 (11:59 +0400)]
removed gpu module from OPENCV2_BASE_MODULES

10 years agorenmaed gpu module -> cuda
Vladislav Vinogradov [Wed, 24 Jul 2013 07:41:44 +0000 (11:41 +0400)]
renmaed gpu module -> cuda

10 years agorenamed gpubgsegm -> cudabgsegm
Vladislav Vinogradov [Wed, 24 Jul 2013 06:44:39 +0000 (10:44 +0400)]
renamed gpubgsegm -> cudabgsegm

10 years agorenamed gpufeatures2d -> cudafeatures2d
Vladislav Vinogradov [Wed, 24 Jul 2013 06:27:59 +0000 (10:27 +0400)]
renamed gpufeatures2d -> cudafeatures2d

10 years agorenamed gpuoptflow -> cudaoptflow
Vladislav Vinogradov [Tue, 23 Jul 2013 13:04:38 +0000 (17:04 +0400)]
renamed gpuoptflow -> cudaoptflow

10 years agorenamed gpuimgproc -> cudaimgproc
Vladislav Vinogradov [Tue, 23 Jul 2013 12:59:34 +0000 (16:59 +0400)]
renamed gpuimgproc -> cudaimgproc

10 years agorenamed gpufilters -> cudafilters
Vladislav Vinogradov [Tue, 23 Jul 2013 12:24:55 +0000 (16:24 +0400)]
renamed gpufilters -> cudafilters

10 years agorenamed gpustereo -> cudastereo
Vladislav Vinogradov [Tue, 23 Jul 2013 12:18:26 +0000 (16:18 +0400)]
renamed gpustereo -> cudastereo

10 years agorenamed gpuwarping -> cudawarping
Vladislav Vinogradov [Tue, 23 Jul 2013 11:57:59 +0000 (15:57 +0400)]
renamed gpuwarping -> cudawarping

10 years agorenamed gpuarithm -> cudaarithm
Vladislav Vinogradov [Tue, 23 Jul 2013 11:24:10 +0000 (15:24 +0400)]
renamed gpuarithm -> cudaarithm

10 years agorenamed gpulegacy -> cudalegacy
Vladislav Vinogradov [Tue, 23 Jul 2013 10:45:58 +0000 (14:45 +0400)]
renamed gpulegacy -> cudalegacy

10 years agorenamed gpucodec -> cudacodec
Vladislav Vinogradov [Tue, 23 Jul 2013 10:29:21 +0000 (14:29 +0400)]
renamed gpucodec -> cudacodec

10 years agorenamed gpu* source to cuda* in core module
Vladislav Vinogradov [Tue, 23 Jul 2013 10:12:04 +0000 (14:12 +0400)]
renamed gpu* source to cuda* in core module

10 years agoremoved compatibility headers
Vladislav Vinogradov [Tue, 23 Jul 2013 09:19:54 +0000 (13:19 +0400)]
removed compatibility headers

10 years agoremoved mark_nvidia.py script
Vladislav Vinogradov [Tue, 23 Jul 2013 09:04:49 +0000 (13:04 +0400)]
removed mark_nvidia.py script

10 years agoremoved perf4au test
Vladislav Vinogradov [Tue, 23 Jul 2013 09:04:35 +0000 (13:04 +0400)]
removed perf4au test

10 years agorenamed gpucodec namespace -> cudacodec
Vladislav Vinogradov [Tue, 23 Jul 2013 08:33:11 +0000 (12:33 +0400)]
renamed gpucodec namespace -> cudacodec

10 years agorenamed gpu::cudev namespace -> cuda::device
Vladislav Vinogradov [Tue, 23 Jul 2013 07:33:51 +0000 (11:33 +0400)]
renamed gpu::cudev  namespace -> cuda::device

cudev is used for new device layer

10 years agorenamed gpu namespace -> cuda
Vladislav Vinogradov [Wed, 28 Aug 2013 11:45:13 +0000 (15:45 +0400)]
renamed gpu namespace -> cuda

10 years agoremoved gpu name usage from ocl module
Vladislav Vinogradov [Mon, 22 Jul 2013 11:31:14 +0000 (15:31 +0400)]
removed gpu name usage from ocl module

10 years agoMerge pull request #1366 from asmorkalov:ocv_autobuffer_fix
Roman Donchenko [Thu, 29 Aug 2013 12:35:38 +0000 (16:35 +0400)]
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix

10 years agoMerge pull request #1309 from pengx17:master_retina_ocl
Roman Donchenko [Thu, 29 Aug 2013 12:26:55 +0000 (16:26 +0400)]
Merge pull request #1309 from pengx17:master_retina_ocl

10 years agoAutoBuffer with initial zero size fixed.
Alexander Smorkalov [Sun, 25 Aug 2013 12:33:22 +0000 (16:33 +0400)]
AutoBuffer with initial zero size fixed.

10 years agoMerge pull request #1356 from SpecLad:homography-uninit
Roman Donchenko [Wed, 28 Aug 2013 14:05:10 +0000 (18:05 +0400)]
Merge pull request #1356 from SpecLad:homography-uninit

10 years agoMerge pull request #1348 from SpecLad:merge-2.4
Roman Donchenko [Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)]
Merge pull request #1348 from SpecLad:merge-2.4

10 years agoFixed incomplete matrix initialization in HomographyRefineCallback.
Roman Donchenko [Wed, 28 Aug 2013 09:20:14 +0000 (13:20 +0400)]
Fixed incomplete matrix initialization in HomographyRefineCallback.

10 years agoRemoved a duplicate line.
Roman Donchenko [Wed, 28 Aug 2013 09:13:15 +0000 (13:13 +0400)]
Removed a duplicate line.

10 years agoRemove trailing whitespace.
peng xiao [Wed, 28 Aug 2013 08:23:46 +0000 (16:23 +0800)]
Remove trailing whitespace.

10 years agoMerge pull request #1342 from nevion:master
Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master

10 years agoMerge pull request #1248 from vkocheganov:chi_square_alt
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt

10 years agoLet ocl::context only be initialized once in retina_ocl test.
peng xiao [Wed, 28 Aug 2013 01:17:05 +0000 (09:17 +0800)]
Let ocl::context only be initialized once in retina_ocl test.

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp

10 years agoMerge pull request #1341 from roynos:master
Roman Donchenko [Tue, 27 Aug 2013 13:47:55 +0000 (17:47 +0400)]
Merge pull request #1341 from roynos:master

10 years agoWar on Whitespace, master edition: tabs.
Roman Donchenko [Tue, 27 Aug 2013 13:13:40 +0000 (17:13 +0400)]
War on Whitespace, master edition: tabs.

10 years agoWar on Whitespace, master edition: file endings.
Roman Donchenko [Tue, 27 Aug 2013 10:23:26 +0000 (14:23 +0400)]
War on Whitespace, master edition: file endings.

10 years agoWar on Whitespace, master edition: trailing spaces.
Roman Donchenko [Tue, 27 Aug 2013 09:57:24 +0000 (13:57 +0400)]
War on Whitespace, master edition: trailing spaces.

10 years agoMerge commit '43aec5ad' into merge-2.4
Roman Donchenko [Tue, 27 Aug 2013 09:26:44 +0000 (13:26 +0400)]
Merge commit '43aec5ad' into merge-2.4

Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py

10 years agoMerge commit '43aec5ad^' into merge-2.4
Roman Donchenko [Tue, 27 Aug 2013 09:23:26 +0000 (13:23 +0400)]
Merge commit '43aec5ad^' into merge-2.4

Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp

10 years agoMerge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
Roman Donchenko [Tue, 27 Aug 2013 08:43:34 +0000 (12:43 +0400)]
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5

10 years agoMerge pull request #1339 from mdim:ml_cpp_wrappers_fix
Roman Donchenko [Tue, 27 Aug 2013 08:37:32 +0000 (12:37 +0400)]
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix

10 years agocorrect range computations, it is difficult to do the more efficient single pass...
Jason Newton [Tue, 27 Aug 2013 07:34:22 +0000 (00:34 -0700)]
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save

10 years agoMerge pull request #1311 from leszekhanusz:png_palette_alpha
Roman Donchenko [Mon, 26 Aug 2013 12:59:44 +0000 (16:59 +0400)]
Merge pull request #1311 from leszekhanusz:png_palette_alpha

10 years agoMerge pull request #1326 from ilya-lavrenov:perf_ocl
Roman Donchenko [Mon, 26 Aug 2013 12:54:59 +0000 (16:54 +0400)]
Merge pull request #1326 from ilya-lavrenov:perf_ocl

10 years agoMerge pull request #1327 from alalek:ocl_master_tests_fix
Roman Donchenko [Mon, 26 Aug 2013 12:44:37 +0000 (16:44 +0400)]
Merge pull request #1327 from alalek:ocl_master_tests_fix

10 years agoMerge pull request #1340 from SpecLad:python-updates
Roman Donchenko [Mon, 26 Aug 2013 12:41:13 +0000 (16:41 +0400)]
Merge pull request #1340 from SpecLad:python-updates

10 years agoMerge pull request #1336 from jet47:gpu-resize
Roman Donchenko [Mon, 26 Aug 2013 12:40:50 +0000 (16:40 +0400)]
Merge pull request #1336 from jet47:gpu-resize

10 years agothe code was refactored and old test system code was removed
ilya-lavrenov [Fri, 23 Aug 2013 14:38:31 +0000 (18:38 +0400)]
the code was refactored and old test system code was removed

10 years agomost of the performance tests was rewritten in google-test manner
ilya-lavrenov [Thu, 22 Aug 2013 14:03:05 +0000 (18:03 +0400)]
most of the performance tests was rewritten in google-test manner

10 years agoIgnore Windows' Thumbs.db
Roy Reapor [Mon, 26 Aug 2013 02:55:00 +0000 (19:55 -0700)]
Ignore Windows' Thumbs.db

10 years agoMoved Sphinx detection outside of the PYTHONINTERP_FOUND block.
Roman Donchenko [Fri, 23 Aug 2013 14:43:06 +0000 (18:43 +0400)]
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.

Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.

10 years agoRefactored NumPy detection.
Roman Donchenko [Fri, 23 Aug 2013 14:41:13 +0000 (18:41 +0400)]
Refactored NumPy detection.

Most importantly, added support for multiple include directores,
but also did some general cleanup.

10 years agoBumped minimal Python version to 2.6.
Roman Donchenko [Fri, 23 Aug 2013 14:31:51 +0000 (18:31 +0400)]
Bumped minimal Python version to 2.6.

Rationale: we already depend on it (e.g. some scripts use print_function).

10 years agoRemoved old Python detection cruft.
Roman Donchenko [Fri, 23 Aug 2013 14:24:02 +0000 (18:24 +0400)]
Removed old Python detection cruft.

None of this should be relevant as of CMake 2.8.7.

10 years agofixed cpp wrappers of ML tree-based models
Maria Dimashova [Fri, 23 Aug 2013 14:13:10 +0000 (18:13 +0400)]
fixed cpp wrappers of ML tree-based models

10 years agoused global memory access for up-scaling
Vladislav Vinogradov [Fri, 23 Aug 2013 09:46:29 +0000 (13:46 +0400)]
used global memory access for up-scaling

10 years agoMerge pull request #1335 from alekcac:ios-build-fix
Roman Donchenko [Fri, 23 Aug 2013 12:54:48 +0000 (16:54 +0400)]
Merge pull request #1335 from alekcac:ios-build-fix

10 years agoMerge pull request #1334 from MarkBelmont:bugfix_1
Roman Donchenko [Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)]
Merge pull request #1334 from MarkBelmont:bugfix_1

10 years agofix CMake changes
Alexander Shishkov [Fri, 23 Aug 2013 12:09:41 +0000 (16:09 +0400)]
fix  CMake changes

10 years agoMerge pull request #1333 from kirill-kornyakov:bugfix-for-3231
Roman Donchenko [Fri, 23 Aug 2013 11:56:10 +0000 (15:56 +0400)]
Merge pull request #1333 from kirill-kornyakov:bugfix-for-3231

10 years agoMerge pull request #1234 from SpecLad:ios-plist
Roman Donchenko [Fri, 23 Aug 2013 11:43:07 +0000 (15:43 +0400)]
Merge pull request #1234 from SpecLad:ios-plist

10 years agoMerge pull request #1304 from berak:doc_tut_cascade
Roman Donchenko [Fri, 23 Aug 2013 11:18:05 +0000 (15:18 +0400)]
Merge pull request #1304 from berak:doc_tut_cascade

10 years agoMerge pull request #1323 from SpecLad:find-git
Roman Donchenko [Fri, 23 Aug 2013 10:48:21 +0000 (14:48 +0400)]
Merge pull request #1323 from SpecLad:find-git

10 years agoMerge pull request #1332 from pengx17:2.4_fix_parallel
Roman Donchenko [Fri, 23 Aug 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #1332 from pengx17:2.4_fix_parallel

10 years agoimproved texture usage:
Vladislav Vinogradov [Thu, 22 Aug 2013 08:50:30 +0000 (12:50 +0400)]
improved texture usage:

* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode

10 years agoadded custom implementation for nearest and linear interpolation
Vladislav Vinogradov [Thu, 22 Aug 2013 08:31:10 +0000 (12:31 +0400)]
added custom implementation for nearest and linear interpolation

10 years agoreorganize code for further modifiction
Vladislav Vinogradov [Thu, 22 Aug 2013 08:03:17 +0000 (12:03 +0400)]
reorganize code for further modifiction

10 years agofixed problems with building iOS version
Alexander Shishkov [Fri, 23 Aug 2013 09:41:19 +0000 (13:41 +0400)]
fixed problems with building iOS version

10 years agoUpdate build_framework.py
Alexander Shishkov [Fri, 23 Aug 2013 08:51:50 +0000 (12:51 +0400)]
Update build_framework.py

10 years agoChanged the brief description of function Mat::colRange from "Create a matrix header...
MarkBelmont [Fri, 23 Aug 2013 08:39:39 +0000 (16:39 +0800)]
Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span."

10 years agobugfix-for-3231
Kirill Kornyakov [Fri, 23 Aug 2013 08:34:35 +0000 (12:34 +0400)]
bugfix-for-3231

10 years agoremoved NPP implementation
Vladislav Vinogradov [Thu, 22 Aug 2013 07:46:09 +0000 (11:46 +0400)]
removed NPP implementation

10 years agoMerge pull request #1322 from SpecLad:terse
Roman Donchenko [Fri, 23 Aug 2013 08:11:41 +0000 (12:11 +0400)]
Merge pull request #1322 from SpecLad:terse

10 years agoMerge pull request #1324 from SpecLad:try-compile
Roman Donchenko [Fri, 23 Aug 2013 08:06:56 +0000 (12:06 +0400)]
Merge pull request #1324 from SpecLad:try-compile

10 years agoMerge pull request #1328 from SpecLad:zlib-update
Roman Donchenko [Fri, 23 Aug 2013 08:06:16 +0000 (12:06 +0400)]
Merge pull request #1328 from SpecLad:zlib-update

10 years agoUpdate cmake files by using CUDA_CUDA_LIBRARIES
Changlin Hsieh [Fri, 23 Aug 2013 08:05:35 +0000 (16:05 +0800)]
Update cmake files by using CUDA_CUDA_LIBRARIES

10 years agoMerge pull request #1329 from SpecLad:msvc-werror
Roman Donchenko [Fri, 23 Aug 2013 08:04:32 +0000 (12:04 +0400)]
Merge pull request #1329 from SpecLad:msvc-werror

10 years agoFix a potential bug of ParallelLoopBodyWrapper::operator(Range)
peng xiao [Fri, 23 Aug 2013 07:35:55 +0000 (15:35 +0800)]
Fix a potential bug of ParallelLoopBodyWrapper::operator(Range)
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.

10 years agoOCL: tests: repair moments implementation in master branch, enable tests
Alexander Alekhin [Thu, 22 Aug 2013 19:33:11 +0000 (23:33 +0400)]
OCL: tests: repair moments implementation in master branch, enable tests

10 years agorebased commits
berak [Thu, 22 Aug 2013 16:16:54 +0000 (18:16 +0200)]
rebased commits

10 years agousing VideoCapture instead of CvCapture* in cascade tutorial
berak [Tue, 20 Aug 2013 08:56:57 +0000 (10:56 +0200)]
using VideoCapture instead of CvCapture* in cascade tutorial

corrected constants,  changed objdetection.cpp as well

updated objDetection2.cpp as well

fixed headers in objdetection2.cpp

removed useles RNG

fixed buildbot warnings (wow, i like that bot!)

victim of the war on whitespace

fixing buildbot warnings

fixing last buildbot warning, heya .

trying to rebase/squash commits

10 years agoAdded warnings-as-errors support for MSVC.
Roman Donchenko [Thu, 22 Aug 2013 14:25:38 +0000 (18:25 +0400)]
Added warnings-as-errors support for MSVC.

10 years agoSet minimal zlib version to 1.2.3.
Roman Donchenko [Thu, 22 Aug 2013 14:06:07 +0000 (18:06 +0400)]
Set minimal zlib version to 1.2.3.

Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.

10 years agoCut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
Roman Donchenko [Thu, 22 Aug 2013 14:04:50 +0000 (18:04 +0400)]
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.

10 years agoUpdated zlib to 1.2.8.
Roman Donchenko [Thu, 22 Aug 2013 13:59:27 +0000 (17:59 +0400)]
Updated zlib to 1.2.8.

10 years agofixer error with incorrect condition
Ilya Lavrenov [Thu, 22 Aug 2013 13:38:55 +0000 (17:38 +0400)]
fixer error with incorrect condition

10 years agoadded a test for ocl::norm
Ilya Lavrenov [Thu, 22 Aug 2013 13:37:48 +0000 (17:37 +0400)]
added a test for ocl::norm

10 years agoOCL: tests: repair/disable failed tests in ocl module
Alexander Alekhin [Wed, 21 Aug 2013 13:12:55 +0000 (17:12 +0400)]
OCL: tests: repair/disable failed tests in ocl module

10 years agoFix errors in usages of try_compile
Roman Donchenko [Thu, 22 Aug 2013 11:46:13 +0000 (15:46 +0400)]
Fix errors in usages of try_compile

* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.

10 years agoDon't search for Git ourselves - CMake can handle it now.
Roman Donchenko [Thu, 22 Aug 2013 09:28:17 +0000 (13:28 +0400)]
Don't search for Git ourselves - CMake can handle it now.

10 years agoMerge pull request #1321 from asmorkalov:winrt_mode_warn_fix
Roman Donchenko [Thu, 22 Aug 2013 08:46:00 +0000 (12:46 +0400)]
Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix

10 years agoDropped the CMAKE_VERBOSE option.
Roman Donchenko [Thu, 22 Aug 2013 08:41:14 +0000 (12:41 +0400)]
Dropped the CMAKE_VERBOSE option.

There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.

10 years agoMerge pull request #1317 from jet47:gpu-tvl1-optimization
Roman Donchenko [Thu, 22 Aug 2013 07:55:24 +0000 (11:55 +0400)]
Merge pull request #1317 from jet47:gpu-tvl1-optimization

10 years agoMerge pull request #1318 from SpecLad:wow
Roman Donchenko [Thu, 22 Aug 2013 07:49:43 +0000 (11:49 +0400)]
Merge pull request #1318 from SpecLad:wow

10 years agoWindowsRT mode build warning fix.
Alexander Smorkalov [Thu, 22 Aug 2013 06:59:27 +0000 (23:59 -0700)]
WindowsRT mode build warning fix.

10 years agoMerge pull request #1316 from asmorkalov:winrt_c4447_fix
Roman Donchenko [Wed, 21 Aug 2013 15:24:25 +0000 (19:24 +0400)]
Merge pull request #1316 from asmorkalov:winrt_c4447_fix

10 years agoConverted tabs to spaces.
Roman Donchenko [Wed, 21 Aug 2013 14:52:15 +0000 (18:52 +0400)]
Converted tabs to spaces.

10 years agoNormalized file endings.
Roman Donchenko [Wed, 21 Aug 2013 13:26:54 +0000 (17:26 +0400)]
Normalized file endings.

10 years agoDeleted all trailing whitespace.
Roman Donchenko [Wed, 21 Aug 2013 12:44:09 +0000 (16:44 +0400)]
Deleted all trailing whitespace.

10 years agoDisabled whitespace checking for 3rdparty.
Roman Donchenko [Tue, 20 Aug 2013 15:33:23 +0000 (19:33 +0400)]
Disabled whitespace checking for 3rdparty.

10 years agoAdded more text/binary/whitespace attributes for files we have.
Roman Donchenko [Mon, 22 Jul 2013 13:14:08 +0000 (17:14 +0400)]
Added more text/binary/whitespace attributes for files we have.