summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorbfriesen <bfriesen>2016-11-20 18:04:52 +0000
committerbfriesen <bfriesen>2016-11-20 18:04:52 +0000
commitd6078923917a42694346d163c0221ce183d97b88 (patch)
tree10092b4557047fa0c213cf27b87964bf1d056120 /tools
parentc28f0e883fb22f8f2de37bd7487da898c574e266 (diff)
downloadlibtiff-d6078923917a42694346d163c0221ce183d97b88.tar.gz
* tools/fax2tiff.c (main): Applied patch by Jörg Ahrens to fix
passing client data for Win32 builds using tif_win32.c (USE_WIN32_FILEIO defined) for file I/O. Patch was provided via email on November 20, 2016.
Diffstat (limited to 'tools')
-rw-r--r--tools/fax2tiff.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index e00de527..01f85540 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,4 +1,4 @@
-/* $Id: fax2tiff.c,v 1.25 2016-10-25 22:22:45 erouault Exp $ */
+/* $Id: fax2tiff.c,v 1.26 2016-11-20 18:04:52 bfriesen Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@@ -283,10 +283,11 @@ main(int argc, char* argv[])
}
#if defined(_WIN32) && defined(USE_WIN32_FILEIO)
client_data.fh = _get_osfhandle(fileno(in));
+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fh);
#else
client_data.fd = fileno(in);
+ TIFFSetClientdata(faxTIFF, (thandle_t) client_data.fd);
#endif
- TIFFSetClientdata(faxTIFF, (thandle_t) &client_data);
TIFFSetFileName(faxTIFF, (const char*)argv[optind]);
TIFFSetField(out, TIFFTAG_IMAGEWIDTH, xsize);
TIFFSetField(out, TIFFTAG_BITSPERSAMPLE, 1);