SOURCES: kdebase-branch.diff, kdegraphics-branch.diff, kdelibs-bra...

arekm arekm at pld-linux.org
Sat Mar 1 22:00:31 CET 2008


Author: arekm                        Date: Sat Mar  1 21:00:31 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.72 -> 1.73) , kdegraphics-branch.diff (1.16 -> 1.17) , kdelibs-branch.diff (1.74 -> 1.75) , kdenetwork-branch.diff (1.35 -> 1.36) , kdepim-branch.diff (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.72 SOURCES/kdebase-branch.diff:1.73
--- SOURCES/kdebase-branch.diff:1.72	Thu Feb 28 23:15:10 2008
+++ SOURCES/kdebase-branch.diff	Sat Mar  1 22:00:23 2008
@@ -1,7 +1,7 @@
 Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
 ===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -60,6 +60,7 @@
  Name[zh_TW]=FSF/UNESCO 自由軟體目錄
  ServiceTypes=SearchProvider
@@ -13,8 +13,8 @@
  
 Index: konqueror/konquerorsu.desktop
 ===================================================================
---- konqueror/konquerorsu.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ konqueror/konquerorsu.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- konqueror/konquerorsu.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ konqueror/konquerorsu.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -60,7 +60,7 @@
  Name[pt]=Gestor de Ficheiros - Modo de Super Utilizador
  Name[pt_BR]=Gerenciador de Arquivos (Modo Super-Usuário)
@@ -26,8 +26,8 @@
  Name[sk]=Správca súborov - Super-používateľský mód
 Index: konsole/other/sumc.desktop
 ===================================================================
---- konsole/other/sumc.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ konsole/other/sumc.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- konsole/other/sumc.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ konsole/other/sumc.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -45,6 +45,7 @@
  Name[pt]=Midnight Commander como Root
  Name[pt_BR]=Midnight Commander - Root
@@ -47,8 +47,8 @@
  Comment[sk]=Nový root Midnight Commander
 Index: konsole/other/su.desktop
 ===================================================================
---- konsole/other/su.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ konsole/other/su.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- konsole/other/su.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ konsole/other/su.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -43,6 +43,7 @@
  Name[pt]=Linha de Comandos Root
  Name[pt_BR]=Shell do Root
@@ -68,8 +68,8 @@
  Comment[sk]=Nový Root shell
 Index: konsole/other/shell.desktop
 ===================================================================
---- konsole/other/shell.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ konsole/other/shell.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- konsole/other/shell.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ konsole/other/shell.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -44,6 +44,7 @@
  Name[pl]=Powłoka
  Name[pt]=Linha de Comandos
@@ -89,8 +89,8 @@
  Comment[sk]=Nový shell
 Index: konsole/other/linux.desktop
 ===================================================================
---- konsole/other/linux.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ konsole/other/linux.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- konsole/other/linux.desktop	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ konsole/other/linux.desktop	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -125,7 +125,7 @@
  Comment[pt]=Nova Consola de Linux
  Comment[pt_BR]=Novo Console do Linux
@@ -102,8 +102,8 @@
  Comment[sk]=Nová linuxová konzola
 Index: ksysguard/ksysguardd/Linux/lmsensors.c
 ===================================================================
---- ksysguard/ksysguardd/Linux/lmsensors.c	(.../tags/KDE/3.5.9/kdebase)	(wersja 780364)
-+++ ksysguard/ksysguardd/Linux/lmsensors.c	(.../branches/KDE/3.5/kdebase)	(wersja 780364)
+--- ksysguard/ksysguardd/Linux/lmsensors.c	(.../tags/KDE/3.5.9/kdebase)	(wersja 781012)
++++ ksysguard/ksysguardd/Linux/lmsensors.c	(.../branches/KDE/3.5/kdebase)	(wersja 781012)
 @@ -29,7 +29,7 @@
  
  #include "lmsensors.h"

================================================================
Index: SOURCES/kdegraphics-branch.diff
diff -u SOURCES/kdegraphics-branch.diff:1.16 SOURCES/kdegraphics-branch.diff:1.17
--- SOURCES/kdegraphics-branch.diff:1.16	Fri Nov  9 15:01:52 2007
+++ SOURCES/kdegraphics-branch.diff	Sat Mar  1 22:00:24 2008
@@ -1,1678 +1,95 @@
-Index: kpdf/core/generator_pdf/generator_pdf.cpp
+Index: kpdf/xpdf/xpdf/Lexer.cc
 ===================================================================
---- kpdf/core/generator_pdf/generator_pdf.cpp	(.../tags/KDE/3.5.8/kdegraphics)	(wersja 734657)
-+++ kpdf/core/generator_pdf/generator_pdf.cpp	(.../branches/KDE/3.5/kdegraphics)	(wersja 734657)
-@@ -152,7 +152,7 @@
-         }
- 
-         // 2. reopen the document using the password
--        GString * pwd2 = new GString( password.data() );
-+        GString * pwd2 = new GString( QString::fromLocal8Bit(password.data()).latin1() );
-             delete pdfdoc;
-         pdfdoc = new PDFDoc( new GString( QFile::encodeName( filePath ) ), pwd2, pwd2 );
-             delete pwd2;
-Index: kpdf/xpdf/xpdf/Stream.cc
+--- kpdf/xpdf/xpdf/Lexer.cc	(.../tags/KDE/3.5.9/kdegraphics)	(wersja 781012)
++++ kpdf/xpdf/xpdf/Lexer.cc	(.../branches/KDE/3.5/kdegraphics)	(wersja 781012)
+@@ -298,7 +298,7 @@
+ 	  n = 0;
+ 	  
+ 	  // we are growing see if the document is not malformed and we are growing too much
+-	  if (objNum > 0)
++	  if (objNum > 0 && xref != NULL)
+ 	  {
+ 	    int newObjNum = xref->getNumEntry(curStr.streamGetPos());
+ 	    if (newObjNum != objNum)
+Index: kpdf/xpdf/splash/SplashFont.cc
 ===================================================================
---- kpdf/xpdf/xpdf/Stream.cc	(.../tags/KDE/3.5.8/kdegraphics)	(wersja 734657)
-+++ kpdf/xpdf/xpdf/Stream.cc	(.../branches/KDE/3.5/kdegraphics)	(wersja 734657)
-@@ -1245,23 +1245,30 @@
-   columns = columnsA;
-   if (columns < 1) {
-     columns = 1;
-+  } else if (columns > INT_MAX - 2) {
-+    columns = INT_MAX - 2;
-   }
--  if (columns + 4 <= 0) {
--    columns = INT_MAX - 4;
--  }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
--  refLine = (short *)gmallocn(columns + 3, sizeof(short));
--  codingLine = (short *)gmallocn(columns + 2, sizeof(short));
-+  // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-+  // ---> max codingLine size = columns + 1
-+  // refLine has one extra guard entry at the end
-+  // ---> max refLine size = columns + 2
-+  codingLine = (int *)gmallocn_checkoverflow(columns + 1, sizeof(int));
-+  refLine = (int *)gmallocn_checkoverflow(columns + 2, sizeof(int));
- 
--  eof = gFalse;
-+  if (codingLine != NULL && refLine != NULL) {
-+    eof = gFalse;
-+    codingLine[0] = columns;
-+  } else {
-+    eof = gTrue;
-+  }
-   row = 0;
-   nextLine2D = encoding < 0;
-   inputBits = 0;
--  codingLine[0] = 0;
--  codingLine[1] = refLine[2] = columns;
--  a0 = 1;
-+  a0i = 0;
-+  outputBits = 0;
- 
-   buf = EOF;
- }
-@@ -1276,13 +1283,18 @@
-   short code1;
- 
-   str->reset();
--  eof = gFalse;
-+
-+  if (codingLine != NULL && refLine != NULL) {
-+    eof = gFalse;
-+    codingLine[0] = columns;
-+  } else {
-+    eof = gTrue;
-+  }
-   row = 0;
-   nextLine2D = encoding < 0;
-   inputBits = 0;
--  codingLine[0] = 0;
--  codingLine[1] = columns;
--  a0 = 1;
-+  a0i = 0;
-+  outputBits = 0;
-   buf = EOF;
- 
-   // skip any initial zero bits and end-of-line marker, and get the 2D
-@@ -1299,211 +1311,230 @@
-   }
- }
- 
-+inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-+  if (a1 > codingLine[a0i]) {
-+    if (a1 > columns) {
-+      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+      err = gTrue;
-+      a1 = columns;
-+    }
-+    if ((a0i & 1) ^ blackPixels) {
-+      ++a0i;
-+    }
-+    codingLine[a0i] = a1;
-+  }
-+}
-+
-+inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-+  if (a1 > codingLine[a0i]) {
-+    if (a1 > columns) {
-+      error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+      err = gTrue;
-+      a1 = columns;
-+    }
-+    if ((a0i & 1) ^ blackPixels) {
-+      ++a0i;
-+    }
-+    codingLine[a0i] = a1;
-+  } else if (a1 < codingLine[a0i]) {
-+    if (a1 < 0) {
-+      error(getPos(), "Invalid CCITTFax code");
-+      err = gTrue;
-+      a1 = 0;
-+    }
-+    while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-+      --a0i;
-+    }
-+    codingLine[a0i] = a1;
+--- kpdf/xpdf/splash/SplashFont.cc	(.../tags/KDE/3.5.9/kdegraphics)	(wersja 781012)
++++ kpdf/xpdf/splash/SplashFont.cc	(.../branches/KDE/3.5/kdegraphics)	(wersja 781012)
+@@ -167,27 +167,35 @@
+     size = ((bitmap2.w + 7) >> 3) * bitmap2.h;
+   }
+   p = NULL; // make gcc happy
+-  for (j = 0; j < cacheAssoc; ++j) {
+-    if ((cacheTags[i+j].mru & 0x7fffffff) == cacheAssoc - 1) {
+-      cacheTags[i+j].mru = 0x80000000;
+-      cacheTags[i+j].c = c;
+-      cacheTags[i+j].xFrac = (short)xFrac;
+-      cacheTags[i+j].yFrac = (short)yFrac;
+-      cacheTags[i+j].x = bitmap2.x;
+-      cacheTags[i+j].y = bitmap2.y;
+-      cacheTags[i+j].w = bitmap2.w;
+-      cacheTags[i+j].h = bitmap2.h;
+-      p = cache + (i+j) * glyphSize;
+-      memcpy(p, bitmap2.data, size);
+-    } else {
+-      ++cacheTags[i+j].mru;
++  if (cacheAssoc == 0)
++  {
++    // we had problems on the malloc of the cache, so ignore it
++    *bitmap = bitmap2;
 +  }
-+}
-+
- int CCITTFaxStream::lookChar() {
-   short code1, code2, code3;
--  int a0New;
--  GBool err, gotEOL;
--  int ret;
--  int bits, i;
-+  int b1i, blackPixels, i, bits;
-+  GBool gotEOL;
- 
--  // if at eof just return EOF
--  if (eof && codingLine[a0] >= columns) {
--    return EOF;
-+  if (buf != EOF) {
-+    return buf;
-   }
- 
-   // read the next row
--  err = gFalse;
--  if (codingLine[a0] >= columns) {
-+  if (outputBits == 0) {
- 
-+    // if at eof just return EOF
-+    if (eof) {
-+      return EOF;
-+    }
-+
-+    err = gFalse;
-+
-     // 2-D encoding
-     if (nextLine2D) {
--      // state:
--      //   a0New = current position in coding line (0 <= a0New <= columns)
--      //   codingLine[a0] = last change in coding line
--      //                    (black-to-white if a0 is even,
--      //                     white-to-black if a0 is odd)
--      //   refLine[b1] = next change in reference line of opposite color
--      //                 to a0
--      // invariants:
--      //   0 <= codingLine[a0] <= a0New
--      //           <= refLine[b1] <= refLine[b1+1] <= columns
--      //   0 <= a0 <= columns+1
--      //   refLine[0] = 0
--      //   refLine[n] = refLine[n+1] = columns
--      //     -- for some 1 <= n <= columns+1
--      // end condition:
--      //   0 = codingLine[0] <= codingLine[1] < codingLine[2] < ...
--      //     < codingLine[n-1] < codingLine[n] = columns
--      //     -- where 1 <= n <= columns+1
-       for (i = 0; codingLine[i] < columns; ++i) {
- 	refLine[i] = codingLine[i];
-       }
--      refLine[i] = refLine[i + 1] = columns;
--      b1 = 1;
--      a0New = codingLine[a0 = 0] = 0;
--      do {
-+      refLine[i++] = columns;
-+      refLine[i] = columns;
-+      codingLine[0] = 0;
-+      a0i = 0;
-+      b1i = 0;
-+      blackPixels = 0;
-+      // invariant:
-+      // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-+      //                                                             <= columns
-+      // exception at left edge:
-+      //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-+      // exception at right edge:
-+      //   refLine[b1i] = refLine[b1i+1] = columns is possible
-+      while (codingLine[a0i] < columns) {
- 	code1 = getTwoDimCode();
- 	switch (code1) {
- 	case twoDimPass:
--	  if (refLine[b1] < columns) {
--	    a0New = refLine[b1 + 1];
--	    b1 += 2;
-+	  addPixels(refLine[b1i + 1], blackPixels);
-+	  if (refLine[b1i + 1] < columns) {
-+	    b1i += 2;
- 	  }
- 	  break;
- 	case twoDimHoriz:
--	  if ((a0 & 1) == 0) {
--	    code1 = code2 = 0;
-+	  code1 = code2 = 0;
-+	  if (blackPixels) {
- 	    do {
--	      code1 += code3 = getWhiteCode();
-+	      code1 += code3 = getBlackCode();
- 	    } while (code3 >= 64);
- 	    do {
--	      code2 += code3 = getBlackCode();
-+	      code2 += code3 = getWhiteCode();
- 	    } while (code3 >= 64);
- 	  } else {
--	    code1 = code2 = 0;
- 	    do {
--	      code1 += code3 = getBlackCode();
-+	      code1 += code3 = getWhiteCode();
- 	    } while (code3 >= 64);
- 	    do {
--	      code2 += code3 = getWhiteCode();
-+	      code2 += code3 = getBlackCode();
- 	    } while (code3 >= 64);
- 	  }
--	  if (code1 > 0 || code2 > 0) {
--	    if (a0New + code1 <= columns) {
--	      codingLine[a0 + 1] = a0New + code1;
--	    } else {
--	      codingLine[a0 + 1] = columns;
-+	  addPixels(codingLine[a0i] + code1, blackPixels);
-+	  if (codingLine[a0i] < columns) {
-+	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-+	  }
-+	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	    b1i += 2;
-+	  }
-+	  break;
-+	case twoDimVertR3:
-+	  addPixels(refLine[b1i] + 3, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	    ++a0;
--	    if (codingLine[a0] + code2 <= columns) {
--	      codingLine[a0 + 1] = codingLine[a0] + code2;
--	    } else {
--	      codingLine[a0 + 1] = columns;
--	    }
--	    ++a0;
--	    a0New = codingLine[a0];
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
--	    }
- 	  }
- 	  break;
--	case twoDimVert0:
--	  if (refLine[b1] < columns) {
--	    a0New = codingLine[++a0] = refLine[b1];
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	case twoDimVertR2:
-+	  addPixels(refLine[b1i] + 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
- 	case twoDimVertR1:
--	  if (refLine[b1] + 1 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 1;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	  addPixels(refLine[b1i] + 1, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
--	case twoDimVertL1:
--	  if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 1;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	case twoDimVert0:
-+	  addPixels(refLine[b1i], blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    ++b1i;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
- 	  }
- 	  break;
--	case twoDimVertR2:
--	  if (refLine[b1] + 2 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 2;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	case twoDimVertL3:
-+	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
- 	  }
- 	  break;
- 	case twoDimVertL2:
--	  if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 2;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
- 	    }
--	  }
--	  break;
--	case twoDimVertR3:
--	  if (refLine[b1] + 3 < columns) {
--	    a0New = codingLine[++a0] = refLine[b1] + 3;
--	    ++b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
- 	    }
--	  } else {
--	    a0New = codingLine[++a0] = columns;
- 	  }
- 	  break;
--	case twoDimVertL3:
--	  if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) {
--	    a0New = codingLine[++a0] = refLine[b1] - 3;
--	    --b1;
--	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
--	      b1 += 2;
-+	case twoDimVertL1:
-+	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
-+	  blackPixels ^= 1;
-+	  if (codingLine[a0i] < columns) {
-+	    if (b1i > 0) {
-+	      --b1i;
-+	    } else {
-+	      ++b1i;
- 	    }
-+	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+	      b1i += 2;
-+	    }
- 	  }
- 	  break;
- 	case EOF:
-+	  addPixels(columns, 0);
- 	  eof = gTrue;
--	  codingLine[a0 = 0] = columns;
--	  return EOF;
-+	  break;
- 	default:
- 	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+	  addPixels(columns, 0);
- 	  err = gTrue;
- 	  break;
- 	}
--      } while (codingLine[a0] < columns);
-+      }
- 
-     // 1-D encoding
-     } else {
--      codingLine[a0 = 0] = 0;
--      while (1) {
-+      codingLine[0] = 0;
-+      a0i = 0;
-+      blackPixels = 0;
-+      while (codingLine[a0i] < columns) {
- 	code1 = 0;
--	do {
--	  code1 += code3 = getWhiteCode();
--	} while (code3 >= 64);
--	codingLine[a0+1] = codingLine[a0] + code1;
--	++a0;
--	if (codingLine[a0] >= columns) {
--	  break;
-+	if (blackPixels) {
-+	  do {
-+	    code1 += code3 = getBlackCode();
-+	  } while (code3 >= 64);
-+	} else {
-+	  do {
-+	    code1 += code3 = getWhiteCode();
-+	  } while (code3 >= 64);
- 	}
--	code2 = 0;
--	do {
--	  code2 += code3 = getBlackCode();
--	} while (code3 >= 64);
--	codingLine[a0+1] = codingLine[a0] + code2;
--	++a0;
--	if (codingLine[a0] >= columns) {
--	  break;
--	}
-+	addPixels(codingLine[a0i] + code1, blackPixels);
-+	blackPixels ^= 1;
-       }
-     }
- 
--    if (codingLine[a0] != columns) {
--      error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
--      // force the row to be the correct length
--      while (codingLine[a0] > columns) {
--	--a0;
--      }
--      codingLine[++a0] = columns;
--      err = gTrue;
--    }
--
-     // byte-align the row
-     if (byteAlign) {
-       inputBits &= ~7;
-@@ -1562,14 +1593,17 @@
-     // this if we know the stream contains end-of-line markers because
-     // the "just plow on" technique tends to work better otherwise
-     } else if (err && endOfLine) {
--      do {
-+      while (1) {
-+	code1 = lookBits(13);
- 	if (code1 == EOF) {
- 	  eof = gTrue;
- 	  return EOF;
- 	}
-+	if ((code1 >> 1) == 0x001) {
-+	  break;
-+	}
- 	eatBits(1);
--	code1 = lookBits(13);
--      } while ((code1 >> 1) != 0x001);
-+      }
-       eatBits(12); 
-       if (encoding > 0) {
- 	eatBits(1);
-@@ -1577,11 +1611,11 @@
-       }
-     }
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdebase-branch.diff?r1=1.72&r2=1.73&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdegraphics-branch.diff?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.74&r2=1.75&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdenetwork-branch.diff?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdepim-branch.diff?r1=1.57&r2=1.58&f=u



More information about the pld-cvs-commit mailing list