Merge pull request #2378 from ngryman:progressive_jpeg
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Mar 2014 08:12:01 +0000 (12:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Mar 2014 08:12:02 +0000 (12:12 +0400)
commitd67b450741a4014f6d7acee79dcebbda68178fe2
treec8ccc8029c6c47ec10d7c23cbdac84a6edcb8c6d
parentd63a8ba018d7ed0f019707a07565bc3eedd43166
parentb211e1d989610e47c57a3e21b7318a21fb70650b
Merge pull request #2378 from ngryman:progressive_jpeg
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/test/test_grfmt.cpp