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 |
|
Alexander Smorkalov
|
16cfc7a531
|
WindowsRT build warning fixes.
|
2013-07-17 00:18:46 -07:00 |
|
Andrey Kamaev
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Andrey Kamaev
|
715fa3303e
|
Move cv::Mat out of core.hpp
|
2013-04-01 15:24:34 +04:00 |
|
Vadim Pisarevsky
|
10702c6d75
|
fixes in bundle adjustment code by Nils Hasler
|
2013-04-01 15:20:35 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
ff5e97c8e4
|
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
|
2011-07-19 12:27:07 +00:00 |
|
Anatoly Baksheev
|
8f4c7db3f6
|
~40 warnings under VS2008
HAVE_CONFIG_H -> HAVE_CVCONFIG_H
|
2011-06-11 17:24:09 +00:00 |
|
Andrey Kamaev
|
23a369b27e
|
Fixed Android build
|
2011-05-12 07:02:39 +00:00 |
|
Xavier Delacour
|
5e4ca22737
|
small updates to bundle adjustment implementation
|
2011-05-11 20:17:15 +00:00 |
|
Vadim Pisarevsky
|
15f56c8aa1
|
fixed member initialization in the sparse bundle adjustment code (ticket #385)
|
2010-11-13 20:31:47 +00:00 |
|
Vadim Pisarevsky
|
f78a3b4cc1
|
updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings
|
2010-07-16 12:54:53 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|