Merge pull request #3613 from asmorkalov:aarch64_tiff

9a6a046c · Vadim Pisarevsky · c29c52a2 · d277a1ba · 9a6a046c
Commit 9a6a046c authored Jan 20, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

grfmt_tiff.cpp modules/highgui/src/grfmt_tiff.cpp +2 -3

No files found.
--- 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"