From 11871528cee96fc7133bfc3093903f4689abb0cc Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 30 Jan 2013 16:36:50 +0400 Subject: [PATCH] Solve conflict between tiff.h and opencv2/core/types_c.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Сonflict exists between some versions of libtiff and opencv headers --- modules/highgui/test/test_grfmt.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/highgui/test/test_grfmt.cpp b/modules/highgui/test/test_grfmt.cpp index 28d30c9b07..c408d89a4d 100644 --- a/modules/highgui/test/test_grfmt.cpp +++ b/modules/highgui/test/test_grfmt.cpp @@ -294,7 +294,12 @@ TEST(Highgui_Jpeg, encode_empty) #ifdef HAVE_TIFF + +// these defines are used to resolve conflict between tiff.h and opencv2/core/types_c.h +#define uint64 uint64_hack_ +#define int64 int64_hack_ #include "tiff.h" + TEST(Highgui_Tiff, decode_tile16384x16384) { // see issue #2161