generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #376 from taka-no-me:solve_tiff_conflict

Browse Source
This commit is contained in:
Andrey Kamaev 2013-01-30 19:36:09 +04:00 committed by OpenCV Buildbot
commit 33c26a93c6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/test/test_grfmt.cpp
View File

@ -294,7 +294,12 @@ TEST(Highgui_Jpeg, encode_empty)
#ifdef HAVE_TIFF #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" #include "tiff.h"
TEST(Highgui_Tiff, decode_tile16384x16384) TEST(Highgui_Tiff, decode_tile16384x16384)
{ {
// see issue #2161 // see issue #2161