cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made last fix more robust if run is less than -1

Browse Source
This commit is contained in:
Frank Warmerdam 2000-03-17 20:33:44 +00:00
parent 7ab7008fbe
commit 93d33a555c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libtiff/tif_fax3.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.8 2000-03-17 18:34:39 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.c,v 1.9 2000-03-17 20:33:44 warmerda Exp $ */
/* /*
* Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1990-1997 Sam Leffler
@ -373,7 +373,7 @@ _TIFFFax3fillruns(u_char* buf, uint32* runs, uint32* erun, uint32 lastx)
x = 0; x = 0;
for (; runs < erun; runs += 2) { for (; runs < erun; runs += 2) {
run = runs[0]; run = runs[0];
if (x+run > lastx || run == -1 ) if (x+run > lastx || run > lastx )
run = runs[0] = (uint16) (lastx - x); run = runs[0] = (uint16) (lastx - x);
if (run) { if (run) {
cp = buf + (x>>3); cp = buf + (x>>3);
@ -412,7 +412,7 @@ _TIFFFax3fillruns(u_char* buf, uint32* runs, uint32* erun, uint32 lastx)
x += runs[0]; x += runs[0];
} }
run = runs[1]; run = runs[1];
if (x+run > lastx || run == -1 ) if (x+run > lastx || run > lastx )
run = runs[1] = lastx - x; run = runs[1] = lastx - x;
if (run) { if (run) {
cp = buf + (x>>3); cp = buf + (x>>3);