Commit 11871528 authored by Andrey Kamaev's avatar Andrey Kamaev

Solve conflict between tiff.h and opencv2/core/types_c.h

Сonflict exists between some versions of libtiff and opencv headers
parent 3a55fb9d
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment