Merge pull request #462 from kobigurk:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 27 Feb 2013 20:38:20 +0000 (00:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Feb 2013 20:38:20 +0000 (00:38 +0400)
commit68bb317ce19f96a0e356e3a1aa1fcd69130948b3
treeb80f78cb1721edcd609cfd73aafc0c09113ca58c
parentd620ef0d5541cd02cf60a8808d2363142f16705c
parent18a5b8dfc645325f180d8738009caa37376db5fc
Merge pull request #462 from kobigurk:master
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/src/grfmt_tiff.hpp
modules/highgui/test/test_grfmt.cpp