summaryrefslogtreecommitdiff
path: root/tiff/libtiff/tiffiop.h
diff options
context:
space:
mode:
Diffstat (limited to 'tiff/libtiff/tiffiop.h')
-rw-r--r--tiff/libtiff/tiffiop.h21
1 files changed, 3 insertions, 18 deletions
diff --git a/tiff/libtiff/tiffiop.h b/tiff/libtiff/tiffiop.h
index 900f47867..b22acb3c1 100644
--- a/tiff/libtiff/tiffiop.h
+++ b/tiff/libtiff/tiffiop.h
@@ -34,22 +34,6 @@
# include <fcntl.h>
#endif
-#ifndef O_RDONLY
-#define O_RDONLY _O_RDONLY
-#endif
-#ifndef O_WRONLY
-#define O_WRONLY _O_WRONLY
-#endif
-#ifndef O_RDWR
-#define O_RDWR _O_RDWR
-#endif
-#ifndef O_CREAT
-#define O_CREAT _O_CREAT
-#endif
-#ifndef O_TRUNC
-#define O_TRUNC _O_TRUNC
-#endif
-
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -71,13 +55,11 @@ extern void *lfind(const void *, const void *, size_t *, size_t,
int (*)(const void *, const void *));
#endif
-#if !defined(__WIN32__)
#if !defined(HAVE_SNPRINTF) && !defined(HAVE__SNPRINTF)
#undef snprintf
#define snprintf _TIFF_snprintf_f
extern int snprintf(char* str, size_t size, const char* format, ...);
#endif
-#endif
#include "tiffio.h"
@@ -386,6 +368,9 @@ extern uint32 _TIFFDefaultStripSize(TIFF* tif, uint32 s);
extern void _TIFFDefaultTileSize(TIFF* tif, uint32* tw, uint32* th);
extern int _TIFFDataSize(TIFFDataType type);
+/*--: Rational2Double: Return size of TIFFSetGetFieldType in bytes. */
+extern int _TIFFSetGetFieldSize(TIFFSetGetFieldType setgettype);
+
extern void _TIFFsetByteArray(void**, void*, uint32);
extern void _TIFFsetString(char**, char*);
extern void _TIFFsetShortArray(uint16**, uint16*, uint32);