profile/ivi/opencv.git
11 years agoMerge branch 'master' into gpu-cuda-rename
Vladislav Vinogradov [Mon, 9 Sep 2013 08:57:35 +0000 (12:57 +0400)]
Merge branch 'master' into gpu-cuda-rename

Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp

11 years agoMerge pull request #1408 from jet47:new-ptr-fixes
Roman Donchenko [Mon, 9 Sep 2013 08:27:26 +0000 (12:27 +0400)]
Merge pull request #1408 from jet47:new-ptr-fixes

11 years agoMerge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
Roman Donchenko [Mon, 9 Sep 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix

11 years agoremoved detail:: prefix int video_reader
Vladislav Vinogradov [Fri, 6 Sep 2013 12:48:13 +0000 (16:48 +0400)]
removed detail:: prefix int video_reader

it conflicts with cv::detail

11 years agorestored original behaviour or release functions for (Buffer and Texture)
Vladislav Vinogradov [Mon, 9 Sep 2013 06:57:45 +0000 (10:57 +0400)]
restored original behaviour or release functions for (Buffer and Texture)

11 years agochanged default parameters in CreateERFiltersNM{1,2} functions. They are not needed...
lluis [Fri, 6 Sep 2013 17:10:53 +0000 (19:10 +0200)]
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.

11 years agofixed rebase conflicts
lluis [Fri, 6 Sep 2013 12:00:11 +0000 (14:00 +0200)]
fixed rebase conflicts

11 years agofixed compilation issues with new Ptr
Vladislav Vinogradov [Fri, 6 Sep 2013 11:52:07 +0000 (15:52 +0400)]
fixed compilation issues with new Ptr

11 years agoMerge branch 'master' into gpu-cuda-rename
Vladislav Vinogradov [Fri, 6 Sep 2013 11:44:44 +0000 (15:44 +0400)]
Merge branch 'master' into gpu-cuda-rename

Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp

11 years agoMerge pull request #1405 from SpecLad:retina-ocl-warn
Roman Donchenko [Fri, 6 Sep 2013 11:10:05 +0000 (15:10 +0400)]
Merge pull request #1405 from SpecLad:retina-ocl-warn

11 years agoremoved blank line at EOF
lluis [Thu, 5 Sep 2013 04:11:01 +0000 (06:11 +0200)]
removed blank line at EOF

11 years agoremoved unnecessary commented block
lluis [Wed, 4 Sep 2013 19:23:16 +0000 (21:23 +0200)]
removed unnecessary commented block

11 years agoremoved trailing whitespaces
lluis [Wed, 4 Sep 2013 19:19:43 +0000 (21:19 +0200)]
removed trailing whitespaces

11 years agobetter parameter settings for the ERFilter sample
lluis [Wed, 4 Sep 2013 18:25:29 +0000 (20:25 +0200)]
better parameter settings for the ERFilter sample

11 years agobetter classifiers performance by training them with a new dataset of "manually"...
lluis [Wed, 4 Sep 2013 18:23:37 +0000 (20:23 +0200)]
better classifiers performance by training them with a new dataset of "manually" selected regions

11 years agofixed a bug in the calculation of the number of inflexion points feature
lluis [Wed, 4 Sep 2013 18:22:05 +0000 (20:22 +0200)]
fixed a bug in the calculation of the number of inflexion points feature

11 years agofixed a typo error in the default min_Probability param of CreateERFilterNM2
lluis [Wed, 4 Sep 2013 18:20:25 +0000 (20:20 +0200)]
fixed a typo error in the default min_Probability param of CreateERFilterNM2

11 years agofixed a bug in the non-max-suppression filter procedure
lluis [Wed, 4 Sep 2013 18:19:13 +0000 (20:19 +0200)]
fixed a bug in the non-max-suppression filter procedure

11 years agoretina_ocl.cpp: removed two unused arrays.
Roman Donchenko [Fri, 6 Sep 2013 08:29:29 +0000 (12:29 +0400)]
retina_ocl.cpp: removed two unused arrays.

11 years agoretina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
Roman Donchenko [Fri, 6 Sep 2013 08:28:59 +0000 (12:28 +0400)]
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.

11 years agoMerge pull request #1281 from SpecLad:the-smartest-pointer
Roman Donchenko [Fri, 6 Sep 2013 07:53:33 +0000 (11:53 +0400)]
Merge pull request #1281 from SpecLad:the-smartest-pointer

11 years agoAdded tests for Ptr.
Roman Donchenko [Thu, 5 Sep 2013 10:53:21 +0000 (14:53 +0400)]
Added tests for Ptr.

11 years agoFixed some dubious uses of tbb::task_scheduler_init.
Roman Donchenko [Thu, 15 Aug 2013 15:54:00 +0000 (19:54 +0400)]
Fixed some dubious uses of tbb::task_scheduler_init.

11 years agoRewrote the documentation for Ptr to fit the new implementation.
Roman Donchenko [Thu, 15 Aug 2013 10:44:25 +0000 (14:44 +0400)]
Rewrote the documentation for Ptr to fit the new implementation.

11 years agoMade Filestorage able to not own its CvFileStorage instance.
Roman Donchenko [Wed, 14 Aug 2013 08:44:58 +0000 (12:44 +0400)]
Made Filestorage able to not own its CvFileStorage instance.

This allows to get rid of the last remaining Ptr<T>::addref calls.

11 years agoReplaced calls to Ptr<T>::ptr to ::dynamicCast.
Roman Donchenko [Wed, 14 Aug 2013 08:44:11 +0000 (12:44 +0400)]
Replaced calls to Ptr<T>::ptr to ::dynamicCast.

11 years agoAdded to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
Roman Donchenko [Wed, 14 Aug 2013 08:41:58 +0000 (12:41 +0400)]
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.

Also changed the static functions to inline, to stop GCC complaining
about unused functions.

11 years agoAdapt Python bindings to the new Ptr.
Roman Donchenko [Wed, 14 Aug 2013 08:32:41 +0000 (12:32 +0400)]
Adapt Python bindings to the new Ptr.

11 years agoJava: removed usages of Ptr<T>::addref().
Roman Donchenko [Tue, 13 Aug 2013 15:12:25 +0000 (19:12 +0400)]
Java: removed usages of Ptr<T>::addref().

Now the features2d class wrappers use composition instead of inheritance.

11 years agoReplace an incorrect usage of Ptr with a simple vector.
Roman Donchenko [Tue, 13 Aug 2013 14:52:06 +0000 (18:52 +0400)]
Replace an incorrect usage of Ptr with a simple vector.

11 years agoBoring changes - samples.
Roman Donchenko [Tue, 13 Aug 2013 14:49:29 +0000 (18:49 +0400)]
Boring changes - samples.

11 years agoBoring changes - apps.
Roman Donchenko [Tue, 13 Aug 2013 14:33:06 +0000 (18:33 +0400)]
Boring changes - apps.

11 years agoBoring changes - legacy.
Roman Donchenko [Tue, 13 Aug 2013 14:29:36 +0000 (18:29 +0400)]
Boring changes - legacy.

11 years agoBoring changes - contrib.
Roman Donchenko [Tue, 13 Aug 2013 14:24:30 +0000 (18:24 +0400)]
Boring changes - contrib.

11 years agoBoring changes - ocl.
Roman Donchenko [Tue, 13 Aug 2013 14:18:38 +0000 (18:18 +0400)]
Boring changes - ocl.

11 years agoBoring changes - gpuwarping.
Roman Donchenko [Tue, 13 Aug 2013 14:58:46 +0000 (18:58 +0400)]
Boring changes - gpuwarping.

11 years agoBoring changes - gpustereo.
Roman Donchenko [Tue, 13 Aug 2013 14:17:21 +0000 (18:17 +0400)]
Boring changes - gpustereo.

11 years agoBoring changes - gpulegacy.
Roman Donchenko [Tue, 13 Aug 2013 14:16:41 +0000 (18:16 +0400)]
Boring changes - gpulegacy.

11 years agoBoring changes - gpuimgproc.
Roman Donchenko [Tue, 13 Aug 2013 14:15:02 +0000 (18:15 +0400)]
Boring changes - gpuimgproc.

11 years agoBoring changes - gpufilters.
Roman Donchenko [Tue, 13 Aug 2013 14:10:26 +0000 (18:10 +0400)]
Boring changes - gpufilters.

11 years agoBoring changes - gpucodec.
Roman Donchenko [Tue, 13 Aug 2013 14:06:39 +0000 (18:06 +0400)]
Boring changes - gpucodec.

11 years agoBoring changes - gpubgsegm.
Roman Donchenko [Tue, 13 Aug 2013 14:05:11 +0000 (18:05 +0400)]
Boring changes - gpubgsegm.

11 years agoBoring changes - gpuarithm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:48 +0000 (18:03 +0400)]
Boring changes - gpuarithm.

11 years agoBoring changes - gpu.
Roman Donchenko [Tue, 13 Aug 2013 14:03:13 +0000 (18:03 +0400)]
Boring changes - gpu.

11 years agoBoring changes - videostab.
Roman Donchenko [Tue, 13 Aug 2013 14:01:59 +0000 (18:01 +0400)]
Boring changes - videostab.

11 years agoBoring changes - video.
Roman Donchenko [Tue, 13 Aug 2013 13:57:49 +0000 (17:57 +0400)]
Boring changes - video.

11 years agoBoring changes - superres.
Roman Donchenko [Tue, 13 Aug 2013 13:57:06 +0000 (17:57 +0400)]
Boring changes - superres.

11 years agoBoring changes - stitching.
Roman Donchenko [Tue, 13 Aug 2013 13:54:12 +0000 (17:54 +0400)]
Boring changes - stitching.

11 years agoBoring changes - softcascade.
Roman Donchenko [Tue, 13 Aug 2013 13:48:37 +0000 (17:48 +0400)]
Boring changes - softcascade.

11 years agoBoring changes - photo.
Roman Donchenko [Tue, 13 Aug 2013 13:46:40 +0000 (17:46 +0400)]
Boring changes - photo.

11 years agoBoring changes - objdetect.
Roman Donchenko [Tue, 13 Aug 2013 13:45:29 +0000 (17:45 +0400)]
Boring changes - objdetect.

11 years agoBoring changes - nonfree.
Roman Donchenko [Tue, 13 Aug 2013 13:36:38 +0000 (17:36 +0400)]
Boring changes - nonfree.

11 years agoBoring changes - ml.
Roman Donchenko [Tue, 13 Aug 2013 13:35:25 +0000 (17:35 +0400)]
Boring changes - ml.

11 years agoBoring changes - features2d.
Roman Donchenko [Tue, 13 Aug 2013 13:30:14 +0000 (17:30 +0400)]
Boring changes - features2d.

11 years agoBoring changes - calib3d.
Roman Donchenko [Tue, 13 Aug 2013 13:03:56 +0000 (17:03 +0400)]
Boring changes - calib3d.

11 years agoBoring changes - bioinspired.
Roman Donchenko [Tue, 13 Aug 2013 12:48:54 +0000 (16:48 +0400)]
Boring changes - bioinspired.

11 years agoBoring changes - highgui.
Roman Donchenko [Tue, 13 Aug 2013 12:47:18 +0000 (16:47 +0400)]
Boring changes - highgui.

11 years agoBoring changes - imgproc.
Roman Donchenko [Tue, 13 Aug 2013 12:39:58 +0000 (16:39 +0400)]
Boring changes - imgproc.

11 years agoBoring changes - core.
Roman Donchenko [Tue, 13 Aug 2013 12:22:07 +0000 (16:22 +0400)]
Boring changes - core.

This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:

* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
  (depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()

and similar changes that are numerous, but primitive.

11 years agoReplaced Ptr with my new implementation.
Roman Donchenko [Tue, 13 Aug 2013 11:18:07 +0000 (15:18 +0400)]
Replaced Ptr with my new implementation.

11 years agoMerge pull request #1399 from pengx17:master_retina_ocl_fix
Roman Donchenko [Thu, 5 Sep 2013 07:57:44 +0000 (11:57 +0400)]
Merge pull request #1399 from pengx17:master_retina_ocl_fix

11 years agoFix a bug of ocl retina on NVIDIA platform.
pengxiao [Wed, 4 Sep 2013 08:38:36 +0000 (16:38 +0800)]
Fix a bug of ocl retina on NVIDIA platform.

11 years agoMerge pull request #1373 from abidrahmank:pykeypoints
Roman Donchenko [Wed, 4 Sep 2013 07:53:32 +0000 (11:53 +0400)]
Merge pull request #1373 from abidrahmank:pykeypoints

11 years agofixed warnings in resize.cu
Vladislav Vinogradov [Wed, 4 Sep 2013 07:15:18 +0000 (11:15 +0400)]
fixed warnings in resize.cu

11 years agoMerge branch 'master' into gpu-cuda-rename
Vladislav Vinogradov [Wed, 4 Sep 2013 05:58:32 +0000 (09:58 +0400)]
Merge branch 'master' into gpu-cuda-rename

Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp

11 years agoMerge pull request #1389 from SpecLad:merge-2.4
Roman Donchenko [Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)]
Merge pull request #1389 from SpecLad:merge-2.4

11 years agoalignment of parameters as per speclad
Abid K [Tue, 3 Sep 2013 15:42:03 +0000 (21:12 +0530)]
alignment of parameters as per speclad

11 years agoMerge pull request #1224 from mbarnach:pca_io
Roman Donchenko [Tue, 3 Sep 2013 14:43:54 +0000 (18:43 +0400)]
Merge pull request #1224 from mbarnach:pca_io

11 years agoNuked the rest of the precomp.cpp files.
Roman Donchenko [Mon, 2 Sep 2013 15:53:45 +0000 (19:53 +0400)]
Nuked the rest of the precomp.cpp files.

Consider this a part of merging #1357.

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp

11 years agoMerge pull request #1385 from asmorkalov:winrt_glob_fix
Roman Donchenko [Mon, 2 Sep 2013 12:05:14 +0000 (16:05 +0400)]
Merge pull request #1385 from asmorkalov:winrt_glob_fix

11 years agoGlobbing accuracy test fail on Windows RT fixed.
Alexander Smorkalov [Mon, 2 Sep 2013 07:57:42 +0000 (00:57 -0700)]
Globbing accuracy test fail on Windows RT fixed.

11 years agoMerge pull request #1302 from kdrobnyh:compare
Roman Donchenko [Mon, 2 Sep 2013 11:11:19 +0000 (15:11 +0400)]
Merge pull request #1302 from kdrobnyh:compare

11 years agoMerge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
Roman Donchenko [Mon, 2 Sep 2013 10:10:05 +0000 (14:10 +0400)]
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample

11 years agofixed video_writer sample
Vladislav Vinogradov [Mon, 26 Aug 2013 07:34:37 +0000 (11:34 +0400)]
fixed video_writer sample

11 years agofixed incorrect GPUs -> CUDAs replacement
Vladislav Vinogradov [Wed, 21 Aug 2013 09:07:17 +0000 (13:07 +0400)]
fixed incorrect GPUs -> CUDAs replacement

11 years agofix documentation
Vladislav Vinogradov [Tue, 20 Aug 2013 13:34:32 +0000 (17:34 +0400)]
fix documentation

11 years agoremoved precomp.cpp files
Vladislav Vinogradov [Tue, 20 Aug 2013 13:16:01 +0000 (17:16 +0400)]
removed precomp.cpp files

11 years agofixed docs
Vladislav Vinogradov [Tue, 20 Aug 2013 11:05:49 +0000 (15:05 +0400)]
fixed docs

11 years agofixed sanity test for cuda module
Vladislav Vinogradov [Wed, 24 Jul 2013 10:52:32 +0000 (14:52 +0400)]
fixed sanity test for cuda module

11 years agoreplaced GPU -> CUDA
Vladislav Vinogradov [Wed, 24 Jul 2013 09:55:18 +0000 (13:55 +0400)]
replaced GPU -> CUDA

11 years agoreplaced gpu->cuda in files names
Vladislav Vinogradov [Wed, 24 Jul 2013 08:01:34 +0000 (12:01 +0400)]
replaced gpu->cuda in files names

11 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

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

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

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

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

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

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

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

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

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

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

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

11 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

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

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

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

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

11 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