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
parent fc37df05ec 99043f6fc2
commit 9218f4976c
146 changed files with 2008 additions and 598 deletions
--- a/modules/highgui/src/files_Qt/Milky/48/1.png
+++ b/modules/highgui/src/files_Qt/Milky/48/1.png
--- a/modules/highgui/src/files_Qt/Milky/48/10.png
+++ b/modules/highgui/src/files_Qt/Milky/48/10.png
--- a/modules/highgui/src/files_Qt/Milky/48/11.png
+++ b/modules/highgui/src/files_Qt/Milky/48/11.png
--- a/modules/highgui/src/files_Qt/Milky/48/12.png
+++ b/modules/highgui/src/files_Qt/Milky/48/12.png
--- a/modules/highgui/src/files_Qt/Milky/48/13.png
+++ b/modules/highgui/src/files_Qt/Milky/48/13.png
--- a/modules/highgui/src/files_Qt/Milky/48/14.png
+++ b/modules/highgui/src/files_Qt/Milky/48/14.png
--- a/modules/highgui/src/files_Qt/Milky/48/16.png
+++ b/modules/highgui/src/files_Qt/Milky/48/16.png
--- a/modules/highgui/src/files_Qt/Milky/48/17.png
+++ b/modules/highgui/src/files_Qt/Milky/48/17.png
--- a/modules/highgui/src/files_Qt/Milky/48/18.png
+++ b/modules/highgui/src/files_Qt/Milky/48/18.png
--- a/modules/highgui/src/files_Qt/Milky/48/19.png
+++ b/modules/highgui/src/files_Qt/Milky/48/19.png
--- a/modules/highgui/src/files_Qt/Milky/48/2.png
+++ b/modules/highgui/src/files_Qt/Milky/48/2.png
--- a/modules/highgui/src/files_Qt/Milky/48/20.png
+++ b/modules/highgui/src/files_Qt/Milky/48/20.png
--- a/modules/highgui/src/files_Qt/Milky/48/21.png
+++ b/modules/highgui/src/files_Qt/Milky/48/21.png
--- a/modules/highgui/src/files_Qt/Milky/48/22.png
+++ b/modules/highgui/src/files_Qt/Milky/48/22.png
--- a/modules/highgui/src/files_Qt/Milky/48/23.png
+++ b/modules/highgui/src/files_Qt/Milky/48/23.png
--- a/modules/highgui/src/files_Qt/Milky/48/24.png
+++ b/modules/highgui/src/files_Qt/Milky/48/24.png
--- a/modules/highgui/src/files_Qt/Milky/48/25.png
+++ b/modules/highgui/src/files_Qt/Milky/48/25.png
--- a/modules/highgui/src/files_Qt/Milky/48/26.png
+++ b/modules/highgui/src/files_Qt/Milky/48/26.png
--- a/modules/highgui/src/files_Qt/Milky/48/27.png
+++ b/modules/highgui/src/files_Qt/Milky/48/27.png
--- a/modules/highgui/src/files_Qt/Milky/48/28.png
+++ b/modules/highgui/src/files_Qt/Milky/48/28.png
--- a/modules/highgui/src/files_Qt/Milky/48/29.png
+++ b/modules/highgui/src/files_Qt/Milky/48/29.png
--- a/modules/highgui/src/files_Qt/Milky/48/3.png
+++ b/modules/highgui/src/files_Qt/Milky/48/3.png
--- a/modules/highgui/src/files_Qt/Milky/48/30.png
+++ b/modules/highgui/src/files_Qt/Milky/48/30.png
--- a/modules/highgui/src/files_Qt/Milky/48/31.png
+++ b/modules/highgui/src/files_Qt/Milky/48/31.png
--- a/modules/highgui/src/files_Qt/Milky/48/32.png
+++ b/modules/highgui/src/files_Qt/Milky/48/32.png
--- a/modules/highgui/src/files_Qt/Milky/48/33.png
+++ b/modules/highgui/src/files_Qt/Milky/48/33.png
--- a/modules/highgui/src/files_Qt/Milky/48/34.png
+++ b/modules/highgui/src/files_Qt/Milky/48/34.png
--- a/modules/highgui/src/files_Qt/Milky/48/35.png
+++ b/modules/highgui/src/files_Qt/Milky/48/35.png
--- a/modules/highgui/src/files_Qt/Milky/48/37.png
+++ b/modules/highgui/src/files_Qt/Milky/48/37.png
--- a/modules/highgui/src/files_Qt/Milky/48/38.png
+++ b/modules/highgui/src/files_Qt/Milky/48/38.png
--- a/modules/highgui/src/files_Qt/Milky/48/39.png
+++ b/modules/highgui/src/files_Qt/Milky/48/39.png
--- a/modules/highgui/src/files_Qt/Milky/48/4.png
+++ b/modules/highgui/src/files_Qt/Milky/48/4.png
--- a/modules/highgui/src/files_Qt/Milky/48/40.png
+++ b/modules/highgui/src/files_Qt/Milky/48/40.png
--- a/modules/highgui/src/files_Qt/Milky/48/41.png
+++ b/modules/highgui/src/files_Qt/Milky/48/41.png
--- a/modules/highgui/src/files_Qt/Milky/48/42.png
+++ b/modules/highgui/src/files_Qt/Milky/48/42.png
--- a/modules/highgui/src/files_Qt/Milky/48/43.png
+++ b/modules/highgui/src/files_Qt/Milky/48/43.png
--- a/modules/highgui/src/files_Qt/Milky/48/44.png
+++ b/modules/highgui/src/files_Qt/Milky/48/44.png
--- a/modules/highgui/src/files_Qt/Milky/48/45.png
+++ b/modules/highgui/src/files_Qt/Milky/48/45.png
--- a/modules/highgui/src/files_Qt/Milky/48/5.png
+++ b/modules/highgui/src/files_Qt/Milky/48/5.png
--- a/modules/highgui/src/files_Qt/Milky/48/6.png
+++ b/modules/highgui/src/files_Qt/Milky/48/6.png
--- a/modules/highgui/src/files_Qt/Milky/48/7.png
+++ b/modules/highgui/src/files_Qt/Milky/48/7.png
--- a/modules/highgui/src/files_Qt/Milky/48/9.png
+++ b/modules/highgui/src/files_Qt/Milky/48/9.png
--- a/modules/highgui/src/files_Qt/Milky/64/1.png
+++ b/modules/highgui/src/files_Qt/Milky/64/1.png
--- a/modules/highgui/src/files_Qt/Milky/64/10.png
+++ b/modules/highgui/src/files_Qt/Milky/64/10.png
--- a/modules/highgui/src/files_Qt/Milky/64/100.png
+++ b/modules/highgui/src/files_Qt/Milky/64/100.png
--- a/modules/highgui/src/files_Qt/Milky/64/11.png
+++ b/modules/highgui/src/files_Qt/Milky/64/11.png
--- a/modules/highgui/src/files_Qt/Milky/64/12.png
+++ b/modules/highgui/src/files_Qt/Milky/64/12.png
--- a/modules/highgui/src/files_Qt/Milky/64/126.png
+++ b/modules/highgui/src/files_Qt/Milky/64/126.png
--- a/modules/highgui/src/files_Qt/Milky/64/13.png
+++ b/modules/highgui/src/files_Qt/Milky/64/13.png
--- a/modules/highgui/src/files_Qt/Milky/64/14.png
+++ b/modules/highgui/src/files_Qt/Milky/64/14.png
--- a/modules/highgui/src/files_Qt/Milky/64/15.png
+++ b/modules/highgui/src/files_Qt/Milky/64/15.png
--- a/modules/highgui/src/files_Qt/Milky/64/16.png
+++ b/modules/highgui/src/files_Qt/Milky/64/16.png
--- a/modules/highgui/src/files_Qt/Milky/64/17.png
+++ b/modules/highgui/src/files_Qt/Milky/64/17.png
--- a/modules/highgui/src/files_Qt/Milky/64/18.png
+++ b/modules/highgui/src/files_Qt/Milky/64/18.png
--- a/modules/highgui/src/files_Qt/Milky/64/19.png
+++ b/modules/highgui/src/files_Qt/Milky/64/19.png
--- a/modules/highgui/src/files_Qt/Milky/64/2.png
+++ b/modules/highgui/src/files_Qt/Milky/64/2.png
--- a/modules/highgui/src/files_Qt/Milky/64/21.png
+++ b/modules/highgui/src/files_Qt/Milky/64/21.png
--- a/modules/highgui/src/files_Qt/Milky/64/22.png
+++ b/modules/highgui/src/files_Qt/Milky/64/22.png
--- a/modules/highgui/src/files_Qt/Milky/64/23.png
+++ b/modules/highgui/src/files_Qt/Milky/64/23.png
--- a/modules/highgui/src/files_Qt/Milky/64/24.png
+++ b/modules/highgui/src/files_Qt/Milky/64/24.png
--- a/modules/highgui/src/files_Qt/Milky/64/25.png
+++ b/modules/highgui/src/files_Qt/Milky/64/25.png
--- a/modules/highgui/src/files_Qt/Milky/64/26.png
+++ b/modules/highgui/src/files_Qt/Milky/64/26.png
--- a/modules/highgui/src/files_Qt/Milky/64/27.png
+++ b/modules/highgui/src/files_Qt/Milky/64/27.png
--- a/modules/highgui/src/files_Qt/Milky/64/28.png
+++ b/modules/highgui/src/files_Qt/Milky/64/28.png
--- a/modules/highgui/src/files_Qt/Milky/64/29.png
+++ b/modules/highgui/src/files_Qt/Milky/64/29.png
--- a/modules/highgui/src/files_Qt/Milky/64/30.png
+++ b/modules/highgui/src/files_Qt/Milky/64/30.png
--- a/modules/highgui/src/files_Qt/Milky/64/31.png
+++ b/modules/highgui/src/files_Qt/Milky/64/31.png
--- a/modules/highgui/src/files_Qt/Milky/64/32.png
+++ b/modules/highgui/src/files_Qt/Milky/64/32.png
--- a/modules/highgui/src/files_Qt/Milky/64/33.png
+++ b/modules/highgui/src/files_Qt/Milky/64/33.png
--- a/modules/highgui/src/files_Qt/Milky/64/34.png
+++ b/modules/highgui/src/files_Qt/Milky/64/34.png
--- a/modules/highgui/src/files_Qt/Milky/64/35.png
+++ b/modules/highgui/src/files_Qt/Milky/64/35.png
--- a/modules/highgui/src/files_Qt/Milky/64/36.png
+++ b/modules/highgui/src/files_Qt/Milky/64/36.png
--- a/modules/highgui/src/files_Qt/Milky/64/37.png
+++ b/modules/highgui/src/files_Qt/Milky/64/37.png
--- a/modules/highgui/src/files_Qt/Milky/64/38.png
+++ b/modules/highgui/src/files_Qt/Milky/64/38.png
--- a/modules/highgui/src/files_Qt/Milky/64/39.png
+++ b/modules/highgui/src/files_Qt/Milky/64/39.png
--- a/modules/highgui/src/files_Qt/Milky/64/4.png
+++ b/modules/highgui/src/files_Qt/Milky/64/4.png
--- a/modules/highgui/src/files_Qt/Milky/64/40.png
+++ b/modules/highgui/src/files_Qt/Milky/64/40.png
--- a/modules/highgui/src/files_Qt/Milky/64/41.png
+++ b/modules/highgui/src/files_Qt/Milky/64/41.png
--- a/modules/highgui/src/files_Qt/Milky/64/42.png
+++ b/modules/highgui/src/files_Qt/Milky/64/42.png
--- a/modules/highgui/src/files_Qt/Milky/64/43.png
+++ b/modules/highgui/src/files_Qt/Milky/64/43.png
--- a/modules/highgui/src/files_Qt/Milky/64/44.png
+++ b/modules/highgui/src/files_Qt/Milky/64/44.png
--- a/modules/highgui/src/files_Qt/Milky/64/45.png
+++ b/modules/highgui/src/files_Qt/Milky/64/45.png
--- a/modules/highgui/src/files_Qt/Milky/64/5.png
+++ b/modules/highgui/src/files_Qt/Milky/64/5.png
--- a/modules/highgui/src/files_Qt/Milky/64/6.png
+++ b/modules/highgui/src/files_Qt/Milky/64/6.png
--- a/modules/highgui/src/files_Qt/Milky/64/65.png
+++ b/modules/highgui/src/files_Qt/Milky/64/65.png
--- a/modules/highgui/src/files_Qt/Milky/64/7.png
+++ b/modules/highgui/src/files_Qt/Milky/64/7.png
--- a/modules/highgui/src/files_Qt/Milky/64/8.png
+++ b/modules/highgui/src/files_Qt/Milky/64/8.png
--- a/modules/highgui/src/files_Qt/Milky/64/9.png
+++ b/modules/highgui/src/files_Qt/Milky/64/9.png
--- a/modules/highgui/src/files_Qt/Milky/64/94.png
+++ b/modules/highgui/src/files_Qt/Milky/64/94.png
--- a/modules/highgui/src/files_Qt/Milky/64/98.png
+++ b/modules/highgui/src/files_Qt/Milky/64/98.png
--- a/modules/highgui/src/files_Qt/Milky/64/99.png
+++ b/modules/highgui/src/files_Qt/Milky/64/99.png
--- a/modules/highgui/src/grfmt_png.cpp
+++ b/modules/highgui/src/grfmt_png.cpp
@@ -277,6 +277,7 @@ bool  PngDecoder::readData( Mat& img )
            else
                png_set_rgb_to_gray( png_ptr, 1, 0.299, 0.587 ); // RGB->Gray

+            png_set_interlace_handling( png_ptr );
            png_read_update_info( png_ptr, info_ptr );

            for( y = 0; y < m_height; y++ )