projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to libtiff-4.0.6 (#764)
[openjpeg.git]
/
thirdparty
/
libtiff
/
tif_print.c
diff --git
a/thirdparty/libtiff/tif_print.c
b/thirdparty/libtiff/tif_print.c
index 9e27ae25936c78734f23b4fd2acf08107cecae75..7b1a4222a3bcb3252e3c79d67bf1820e921473b6 100644
(file)
--- a/
thirdparty/libtiff/tif_print.c
+++ b/
thirdparty/libtiff/tif_print.c
@@
-1,4
+1,4
@@
-/* $Id: tif_print.c,v 1.6
1 2012-12-12 22:50:18 tgl
Exp $ */
+/* $Id: tif_print.c,v 1.6
2 2015-08-19 02:31:04 bfriesen
Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
/*
* Copyright (c) 1988-1997 Sam Leffler
@@
-35,7
+35,7
@@
#include <ctype.h>
static void
#include <ctype.h>
static void
-_TIFFprintAsciiBounded(FILE* fd, const char* cp,
in
t max_chars);
+_TIFFprintAsciiBounded(FILE* fd, const char* cp,
size_
t max_chars);
static const char *photoNames[] = {
"min-is-white", /* PHOTOMETRIC_MINISWHITE */
static const char *photoNames[] = {
"min-is-white", /* PHOTOMETRIC_MINISWHITE */
@@
-395,7
+395,7
@@
TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
for (cp = td->td_inknames;
i > 0 && cp < td->td_inknames + td->td_inknameslen;
cp = strchr(cp,'\0')+1, i--) {
for (cp = td->td_inknames;
i > 0 && cp < td->td_inknames + td->td_inknameslen;
cp = strchr(cp,'\0')+1, i--) {
-
in
t max_chars =
+
size_
t max_chars =
td->td_inknameslen - (cp - td->td_inknames);
fputs(sep, fd);
_TIFFprintAsciiBounded(fd, cp, max_chars);
td->td_inknameslen - (cp - td->td_inknames);
fputs(sep, fd);
_TIFFprintAsciiBounded(fd, cp, max_chars);
@@
-679,7
+679,7
@@
_TIFFprintAscii(FILE* fd, const char* cp)
}
static void
}
static void
-_TIFFprintAsciiBounded(FILE* fd, const char* cp,
in
t max_chars)
+_TIFFprintAsciiBounded(FILE* fd, const char* cp,
size_
t max_chars)
{
for (; max_chars > 0 && *cp != '\0'; cp++, max_chars--) {
const char* tp;
{
for (; max_chars > 0 && *cp != '\0'; cp++, max_chars--) {
const char* tp;