applied patch 1373127

[wxWidgets.git] / src / tiff / tif_fax3.h

diff --git a/src/tiff/tif_fax3.h b/src/tiff/tif_fax3.h
index a9f1fcb23b389f4dd08a641abae475ecb911bbf8..e64b145debf2990e9c6508b04d476168b9c6c7f8 100644 (file)
--- a/src/tiff/tif_fax3.h
+++ b/src/tiff/tif_fax3.h
@@ -360,6 +360,8 @@ static const char* StateNames[] = {
     doneBlack1d:                                                       \
        if (a0 >= lastx)                                                \
            goto done1d;                                                \
+        if( *(pa-1) == 0 && *(pa-2) == 0 )                             \
+            pa -= 2;                                                    \
     }                                                                  \
 eof1d:                                                                 \
     prematureEOF(a0);                                                  \
@@ -485,9 +487,10 @@ done1d:                                                                    \
            goto eol2d;                                                 \
        case S_EOL:                                                     \
            *pa++ = lastx - a0;                                         \
-           NeedBits8(5,eof2d);                                         \
-           if (GetBits(5))                                             \
+           NeedBits8(4,eof2d);                                         \
+           if (GetBits(4))                                             \
                unexpected("EOL", a0);                                  \
+            ClrBits(4);                                                 \
            EOLcnt = 1;                                                 \
            goto eol2d;                                                 \
        default:                                                        \