fix merge

dc50dc72 · Matti Picus · f5330a44 · dc50dc72
Commit dc50dc72 authored Feb 21, 2014 by Matti Picus
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test_grfmt.cpp modules/highgui/test/test_grfmt.cpp +1 -1

No files found.
--- a/modules/highgui/test/test_grfmt.cpp
+++ b/modules/highgui/test/test_grfmt.cpp
@@ -420,7 +420,7 @@ TEST(Highgui_Tiff, decode_tile16384x16384)
    remove(file4.c_str());
 }

-class CV_GrfmtReadTifTiledWithNotFullTiles: public cvtest::BaseTest
+TEST(Highgui_Tiff, write_read_16bit_big_little_endian)
 {
    // see issue #2601 "16-bit Grayscale TIFF Load Failures Due to Buffer Underflow and Endianness"