From dc50dc72548a9b7c970610ee95a7797e644040be Mon Sep 17 00:00:00 2001
From: Matti Picus <matti.picus@gmail.com>
Date: Fri, 21 Feb 2014 13:54:58 +0200
Subject: [PATCH] fix merge

---
 modules/highgui/test/test_grfmt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/highgui/test/test_grfmt.cpp b/modules/highgui/test/test_grfmt.cpp
index bd9e79ad02..f451036ab9 100644
--- 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"