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)
commita782ee93de5f3570f2412dd654a10b3157f2bcee
tree872d2fca047e6075b8635b5b5e7390df3a41a529
parentdce1824a915be33100cba4d9213a39652951869d
parenteaec13209135bd28c73d15017645ee065c9ca003
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
modules/imgcodecs/test/test_grfmt.cpp