Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 30 Jul 2014 12:48:41 +0000 (12:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 30 Jul 2014 12:48:41 +0000 (12:48 +0000)
1  2 
modules/imgcodecs/test/test_grfmt.cpp

Simple merge