[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2008-06-21 14:32:31
Message-ID: 1214058751.100065.6711.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 822788 by aacid:

somehow i forgot to commit this part of \
http://cgit.freedesktop.org/poppler/poppler/commit/?id=2a12409ebbf96ea3ca4556b71231a45ae37cb052


Sorry :-(

BUG: 164568



 M  +4 -3      JBIG2Stream.cc  


--- branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf/JBIG2Stream.cc #822787:822788
@@ -507,7 +507,7 @@
     ++nBytesRead;
   }
   while (1) {
-    if (bufLen >= 7 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
+    if (bufLen >= 11 && ((buf >> (bufLen - 7)) & 0x7f) == 0) {
       if (bufLen <= 12) {
 	code = buf << (12 - bufLen);
       } else {
@@ -550,14 +550,15 @@
     ++nBytesRead;
   }
   while (1) {
-    if (bufLen >= 6 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
+    if (bufLen >= 10 && ((buf >> (bufLen - 6)) & 0x3f) == 0) {
       if (bufLen <= 13) {
 	code = buf << (13 - bufLen);
       } else {
 	code = buf >> (bufLen - 13);
       }
       p = &blackTab1[code & 0x7f];
-    } else if (bufLen >= 4 && ((buf >> (bufLen - 4)) & 0x0f) == 0) {
+    } else if (bufLen >= 7 && ((buf >> (bufLen - 4)) & 0x0f) == 0 &&
+	       ((buf >> (bufLen - 6)) & 0x03) != 0) {
       if (bufLen <= 12) {
 	code = buf << (12 - bufLen);
       } else {


[prev in list] [next in list] [prev in thread] [next in thread]