potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 23:03:03 +04:00
Code Packages Releases Wiki Activity
13,950 Commits 7 Branches 132 Tags
cf2a30783200c19d40f41c19127747255eecdc21
Commit Graph

45 Commits

Author SHA1 Message Date
Ilya Lavrenov 926cab2baa fixed warnings 2013-12-06 15:20:29 +04:00
siddharth 33e6c07485 Removed build errors and removed test images 
Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder
 2013-12-04 19:18:00 +05:30
siddharth f85a615f3f whitespaces removed and other minor changes to fix build error 
Update 1

update 2

Update 3

Update 4

Update 5

update 6

Update 7

Update 8

Update 9

Update 10

Update 11

Update 12

Update 13

Update 14

Update 15

Update 16

Update 17

Update 18

Update 19

Update 20

Update 21

Update 22

Removed Headers

Update 23

Update 24

Update 25

Update 26

Update 27

Update 28
 2013-12-04 19:17:59 +05:30
siddharth 56ab1c18e6 new filters added and all the 3 modules updated 
All 3 modules Updated
 2013-12-04 19:17:58 +05:30
siddharth e170115ad0 new interface added. decolor and cloning module added. 
Both modules added
 2013-12-04 19:17:58 +05:30
siddharth a1b3ba02a7 add color_boost + doc 2013-12-04 19:17:58 +05:30
Roman Donchenko 1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Fedor Morozov c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Fedor Morozov f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Fedor Morozov a7bcf63765 Robertson docs 2013-09-06 18:21:59 +04:00
Fedor Morozov deeaddb0a9 Doc update 2013-09-06 14:49:19 +04:00
Fedor Morozov f4792f8a44 Doc update 2013-09-06 14:43:04 +04:00
Vladislav Vinogradov cbe437571e fixed docs 2013-09-02 14:00:44 +04:00
Roman Donchenko 9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
abidrahmank 92d04d439e docs changes 2013-08-13 21:58:49 +05:30
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
StevenPuttemans ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
Fedor Morozov 19082e0504 Documentation update 2013-08-07 11:15:41 +04:00
Fedor Morozov 3725c1fb4c Documentation updates 2013-08-06 18:13:34 +04:00
Fedor Morozov e914fc2471 Merge branch 'master' of https://github.com/f-morozov/opencv 2013-08-06 17:49:29 +04:00
Fedor Morozov 4a4c5190f0 Documentation updates 2013-08-06 17:49:02 +04:00
Alexander Shishkov 3c218717a9 Merge branch 'master' of https://github.com/f-morozov/opencv 2013-08-06 15:41:39 +04:00
Alexander Shishkov c4fb0e9dbb few changes for compilation 2013-08-06 15:41:32 +04:00
Fedor Morozov bef8d8192e Minor fixes, new MergeDebevec 2013-08-06 15:24:01 +04: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
Fedor Morozov 4c0f7f9e59 Tonemapping documentation update 2013-08-05 20:35:48 +04:00
StevenPuttemans f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Fedor Morozov c51b50b44c Algorithm names in code 2013-08-02 00:01:15 +04:00
Fedor Morozov ed0828d0a8 New HDR documentation 2013-08-01 15:34:03 +04:00
StevenPuttemans 0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169 
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
 2013-07-31 11:20:05 +02:00
abidrahmank f36b9940e8 ref in inpainting docs 2013-07-20 14:07:19 +05:30
Fedor Morozov ec668ce3a7 Documentation 2013-07-19 00:23:49 +04:00
abidrahmank 61e50e2fda python docs for non-local means denoising 2013-07-13 16:00:15 +05:30
Vladislav Vinogradov 3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Andrey Kamaev 416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov e72ba73e70 moved gpu nlm to photo module 2013-04-18 11:33:33 +04:00
Andrey Kamaev 8b294c6c90 Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
Andrey Kamaev 73bbabf207 Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-18 13:03:12 +04:00
Andrey Kamaev 0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
Andrey Kamaev 461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers 
All errors were found by doc/check_docs2.py
 2012-10-17 21:24:55 +04:00
Victor Passichenko 1f42de39a3 Add non-local means denoising algorithm implementatation into photo module 2012-08-19 13:13:58 +04:00
Andrey Kamaev eb2f1f81ed Fixed hundreds of documentation problems 2012-05-28 07:36:14 +00:00
Vadim Pisarevsky 2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky 957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00