Merge pull request #3613 from asmorkalov:aarch64_tiff

2015-01-20 12:36:38 +00:00
parent c29c52a216 d277a1ba75
commit 9a6a046caf
1 changed files with 2 additions and 3 deletions
--- a/modules/highgui/src/grfmt_tiff.cpp
+++ b/modules/highgui/src/grfmt_tiff.cpp
@@ -50,9 +50,8 @@
 #include "precomp.hpp"
 #include "grfmt_tiff.hpp"

-#if !defined _MSC_VER && !defined __BORLANDC__
-#  include <stdint.h>
-#endif
+#define int64 int64_tiff
+#define uint64 uint64_tiff

 #ifdef HAVE_TIFF
 # include "tiff.h"