summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2010-06-30 15:43:27 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2010-06-30 15:43:27 +0000
commit7244ee13faf036e5f9c0469252850ece679a9de3 (patch)
treee4492535bcce50fcb686cffb1e64b4d132625e2a
parentb1fb1b5fee0229161b53fa37a40e4734a44af51f (diff)
downloadlibtiff-git-7244ee13faf036e5f9c0469252850ece679a9de3.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog3
-rw-r--r--tools/tiff2pdf.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 44bd24b4..b8b748ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-06-30 Andrey Kiselev <dron@ak4719.spb.edu>
+ * tools/tiff2pdf.c: Fixed computation of the tile buffer size when
+ converting JPEG encoded tiles.
+
* tools/tiff2pdf.c: Better handling of string fields, use static
string buffers instead of dynamically allocated, use strncpy() instead
of strcpy(), control the string lengths.
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
index 8ae71225..3c4147ba 100644
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
@@ -1,4 +1,4 @@
-/* $Id: tiff2pdf.c,v 1.37.2.12 2010-06-30 14:21:46 dron Exp $
+/* $Id: tiff2pdf.c,v 1.37.2.13 2010-06-30 15:43:27 dron Exp $
*
* tiff2pdf - converts a TIFF image to a PDF document
*
@@ -1905,7 +1905,7 @@ void t2p_read_tiff_size_tile(T2P* t2p, TIFF* input, ttile_t tile){
if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt)!=0){
if(count > 4){
t2p->tiff_datasize += count;
- t2p->tiff_datasize -= 4; /* don't use EOI of header or SOI of tile */
+ t2p->tiff_datasize -= 2; /* don't use EOI of header or SOI of tile */
}
}
}