allow zero length runs at start of fax3 lines

This commit is contained in:
Frank Warmerdam 2011-03-10 20:23:07 +00:00
parent 8e9fb97983
commit 4dda1458c6
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2011-03-10 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_fax3.h: Fix to last change allowing zero length
runs at the start of a scanline - needed for legal cases.
2011-03-02 Frank Warmerdam <warmerdam@pobox.com> 2011-03-02 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_fax3.h: Protect against a fax VL(n) codeword commanding * libtiff/tif_fax3.h: Protect against a fax VL(n) codeword commanding

View File

@ -1,4 +1,4 @@
/* $Id: tif_fax3.h,v 1.8 2011-03-03 01:38:25 fwarmerdam Exp $ */ /* $Id: tif_fax3.h,v 1.9 2011-03-10 20:23:07 fwarmerdam Exp $ */
/* /*
* Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1990-1997 Sam Leffler
@ -479,8 +479,10 @@ done1d: \
case S_VL: \ case S_VL: \
CHECK_b1; \ CHECK_b1; \
if (b1 <= (int) (a0 + TabEnt->Param)) { \ if (b1 <= (int) (a0 + TabEnt->Param)) { \
unexpected("VL", a0); \ if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \
goto eol2d; \ unexpected("VL", a0); \
goto eol2d; \
} \
} \ } \
SETVALUE(b1 - a0 - TabEnt->Param); \ SETVALUE(b1 - a0 - TabEnt->Param); \
b1 -= *--pb; \ b1 -= *--pb; \