Roman Donchenko
|
439e90f4f4
|
retina_ocl.cpp: removed two unused arrays.
|
2013-09-06 12:34:37 +04:00 |
|
Roman Donchenko
|
af594c8e44
|
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
|
2013-09-06 12:33:54 +04:00 |
|
Roman Donchenko
|
711fb6bd92
|
Boring changes - bioinspired.
|
2013-09-05 18:26:43 +04:00 |
|
pengxiao
|
e45f92a9e1
|
Fix a bug of ocl retina on NVIDIA platform.
|
2013-09-04 16:38:36 +08:00 |
|
Roman Donchenko
|
18bb951574
|
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
|
2013-09-02 19:53:45 +04:00 |
|
Roman Donchenko
|
9218f4976c
|
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
|
2013-09-02 19:44:51 +04:00 |
|
Roman Donchenko
|
86f4cd253a
|
Merge pull request #1309 from pengx17:master_retina_ocl
|
2013-08-29 16:26:55 +04:00 |
|
peng xiao
|
9f0a88c1d6
|
Remove trailing whitespace.
|
2013-08-28 16:23:46 +08:00 |
|
peng xiao
|
287c8a3330
|
Let ocl::context only be initialized once in retina_ocl test.
|
2013-08-28 09:17:05 +08:00 |
|
peng xiao
|
9b20b51389
|
Fix build error on Mac
|
2013-08-21 14:23:10 +08:00 |
|
peng xiao
|
3cccded86d
|
Fix build error when WITH_OPENCL is disabled.
|
2013-08-21 11:18:02 +08:00 |
|
Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
peng xiao
|
29eefe52bb
|
Add OpenCL accelerated implementation for Retina.
|
2013-08-13 16:27:12 +08:00 |
|
Roman Donchenko
|
dcaf923517
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
|
2013-08-06 13:56:49 +04:00 |
|
alexandre benoit
|
12f65c61a8
|
updated doc wrt new bioinspired namespace convention
|
2013-07-15 09:58:16 +02:00 |
|
alexandre benoit
|
7fe78efda3
|
retina included in namespace bioinspired + followed suggestions made by Vadim
|
2013-07-14 19:28:37 +02:00 |
|
alexandre benoit
|
c39159069e
|
last warnings solved
|
2013-06-13 07:36:37 +02:00 |
|
alexandre benoit
|
2c1fb5fd71
|
minor correction after buildbot warnings
|
2013-06-13 06:55:35 +02:00 |
|
alexandre benoit
|
7bff79bbeb
|
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
|
2013-06-12 22:43:36 +02:00 |
|
alexandre benoit
|
cdbbe0dfbe
|
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
|
2013-06-12 22:40:43 +02:00 |
|