Roman Donchenko
|
3939d78336
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp
|
2013-07-22 18:38:57 +04:00 |
|
StevenPuttemans
|
a58860d35a
|
Removed Note, added other fix (libs to lib)
|
2013-07-17 15:02:55 +02:00 |
|
StevenPuttemans
|
d42b283abf
|
Changed tutorial for installing openCV under VS2010 like bug 3157 suggested
|
2013-07-17 13:38:45 +02:00 |
|
Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|
Kirill Kornyakov
|
0339dd51f1
|
Removed all references to trunk
|
2013-06-28 12:38:44 +04:00 |
|
Andrey Kamaev
|
0e7ca71dcc
|
Normalize whitespace in documentation and text files
|
2012-10-17 21:42:09 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Alexander Shishkov
|
37295d7b35
|
fixed #1833
|
2012-04-27 14:00:59 +00:00 |
|
Bernat Gabor
|
43e083f145
|
Ok, now optimized the tutorial size for real. Made JPG/PNG optimization for all the images. Modified some tutorial files to follow these size optimizations. Now the tutorial PDF generated is 3.95MB, so enjoy!
|
2011-07-20 18:08:25 +00:00 |
|
Bernat Gabor
|
4168b75edc
|
Some tutorial extending of the Windows install and usage. Display Image retouching.
|
2011-07-08 19:43:29 +00:00 |
|
Bernat Gabor
|
e18de3c6ab
|
Added the OpenCV with Visual Studio tutorial. Enhanced, extended the Windows Installation one. Some minor CSS changes to avoid unnecessary large spaces inside enumerations in the tutorials.
|
2011-07-06 00:01:27 +00:00 |
|
Bernat Gabor
|
6be9fbfa6d
|
Reformatted the TOC tables in tutorials to look just as good in PDFs as in HTML. Updated the default.css_t too for this. Added the "Windows Install" tutorial (with videos).
|
2011-07-04 11:04:56 +00:00 |
|