Roman Donchenko
|
029fce10c9
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
|
2013-05-21 17:19:23 +04:00 |
|
Andrey Kamaev
|
2665c39a0d
|
Fix build warnings from gcc 4.8
|
2013-05-13 17:07:30 +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 |
|
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
|
bb93651048
|
added support for bi-level PNG's (patch #2301; thanks to Costantino Grana)
|
2012-09-11 14:05:25 +04:00 |
|
Andrey Kamaev
|
25f70e691a
|
Fixed warnigs from zlib defines
|
2012-06-21 10:28:57 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +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
|
448a252776
|
added compression strategy as a parameter (another request from ticket #1452)
|
2011-10-28 04:11:02 +00:00 |
|
Vadim Pisarevsky
|
17c3102705
|
improved png compression ratio (ticket #1452)
|
2011-10-28 02:22:11 +00:00 |
|
Vadim Pisarevsky
|
c65c67eff4
|
preserve alpha channel in PNG, when imread(..., -1) is called (ticket #1107)
|
2011-08-11 22:38:09 +00:00 |
|
Vadim Pisarevsky
|
0bf4d9ec2b
|
fixed Xcode 4.1 compile errors in png codec in highgui
|
2011-07-21 19:50:20 +00:00 |
|
Vadim Pisarevsky
|
caa943c85f
|
made png codec in highgui compatible with libpng-1.5 (thanks to wiz for the patch)
|
2011-04-26 12:41:42 +00:00 |
|
Vadim Pisarevsky
|
4339f69da4
|
fix opencv-highgui build with old versions of libpng (< 1.4.x)
|
2010-12-11 18:05:50 +00:00 |
|
Vadim Pisarevsky
|
beee6f2f70
|
pass the correct rgb->gray coefficients to PNG decoder, to match cvtColor's.
|
2010-11-24 19:50:52 +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 |
|