SOURCES: kdegraphics-branch.diff - more xpdf fixes

[arekm]

Author: arekm                        Date: Wed Dec 14 10:28:59 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- more xpdf fixes

---- Files affected:
SOURCES:
   kdegraphics-branch.diff (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/kdegraphics-branch.diff
diff -u SOURCES/kdegraphics-branch.diff:1.8 SOURCES/kdegraphics-branch.diff:1.9
--- SOURCES/kdegraphics-branch.diff:1.8 Fri Dec  9 08:29:26 2005
+++ SOURCES/kdegraphics-branch.diff     Wed Dec 14 11:28:54 2005
@@ -1,7 +1,7 @@
 Index: kpdf/kpdf_part.desktop
 ===================================================================
---- kpdf/kpdf_part.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/kpdf_part.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kpdf/kpdf_part.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/kpdf_part.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -4,7 +4,6 @@
  Name=KPDF
  Name[ar]=برنامج KPDF
@@ -12,8 +12,8 @@
  ServiceTypes=KParts/ReadOnlyPart
 Index: kpdf/part.cpp
 ===================================================================
---- kpdf/part.cpp      (.../tags/KDE/3.5.0/kdegraphics)        (revision 
486886)
-+++ kpdf/part.cpp      (.../branches/KDE/3.5/kdegraphics)      (revision 
486886)
+--- kpdf/part.cpp      (.../tags/KDE/3.5.0/kdegraphics)        (revision 
488404)
++++ kpdf/part.cpp      (.../branches/KDE/3.5/kdegraphics)      (revision 
488404)
 @@ -274,6 +274,8 @@
        connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( 
slotFileDirty( const QString& ) ) );
        m_dirtyHandler = new QTimer( this );
@@ -34,8 +34,8 @@
      return false;
 Index: kpdf/part.h
 ===================================================================
---- kpdf/part.h        (.../tags/KDE/3.5.0/kdegraphics)        (revision 
486886)
-+++ kpdf/part.h        (.../branches/KDE/3.5/kdegraphics)      (revision 
486886)
+--- kpdf/part.h        (.../tags/KDE/3.5.0/kdegraphics)        (revision 
488404)
++++ kpdf/part.h        (.../branches/KDE/3.5/kdegraphics)      (revision 
488404)
 @@ -146,6 +146,11 @@
        // static instances counter
        static unsigned int m_count;
@@ -48,37 +48,117 @@
        KDirWatch *m_watcher;
        QTimer *m_dirtyHandler;
        DocumentViewport m_viewportDirty;
-Index: kpdf/xpdf/xpdf/Stream.cc
+Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
 ===================================================================
---- kpdf/xpdf/xpdf/Stream.cc   (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/xpdf/xpdf/Stream.cc   (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
-@@ -403,18 +403,33 @@
- 
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
-                                int widthA, int nCompsA, int nBitsA) {
-+  int totalBits;
+--- kpdf/xpdf/xpdf/JBIG2Stream.cc      (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/xpdf/JBIG2Stream.cc      (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -681,9 +682,15 @@
+   w = wA;
+   h = hA;
+   line = (wA + 7) >> 3;
+-  // need to allocate one extra guard byte for use in combine()
+-  data = (Guchar *)gmalloc(h * line + 1);
+-  data[h * line] = 0;
++
++  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
++    data = NULL;
++  }
++  else {
++    // need to allocate one extra guard byte for use in combine()
++    data = (Guchar *)gmalloc(h * line + 1);
++    data[h * line] = 0;
++  }
+ }
+ 
+ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
+@@ -692,6 +699,12 @@
+   w = bitmap->w;
+   h = bitmap->h;
+   line = bitmap->line;
++
++  if (h < 0 || line <= 0 || h >= INT_MAX / line) {
++    data = NULL;
++    return;
++  }
++ 
+   // need to allocate one extra guard byte for use in combine()
+   data = (Guchar *)gmalloc(h * line + 1);
+   memcpy(data, bitmap->data, h * line);
+@@ -720,7 +733,7 @@
+ }
+ 
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+-  if (newH <= h) {
++  if (newH <= h || line <= 0 || newH >= INT_MAX / line) {
+     return;
+   }
+   // need to allocate one extra guard byte for use in combine()
+@@ -2305,6 +2318,15 @@
+     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone 
segment");
+     return;
+   }
++  if (gridH == 0 || gridW >= INT_MAX / gridH) {
++    error(getPos(), "Bad size in JBIG2 halftone segment");
++    return;
++  }
++  if (w == 0 || h >= INT_MAX / w) {
++     error(getPos(), "Bad size in JBIG2 bitmap segment");
++    return;
++  }
++
+   patternDict = (JBIG2PatternDict *)seg;
+   bpp = 0;
+   i = 1;
+@@ -2936,6 +2958,9 @@
+   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
+   int x, y, pix;
+ 
++  if (w < 0 || h <= 0 || w >= INT_MAX / h)
++    return NULL;
 +
-   str = strA;
-   predictor = predictorA;
+   bitmap = new JBIG2Bitmap(0, w, h);
+   bitmap->clearToZero();
+ 
+Index: kpdf/xpdf/xpdf/Stream.cc
+===================================================================
+--- kpdf/xpdf/xpdf/Stream.cc   (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/xpdf/Stream.cc   (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+@@ -408,13 +409,27 @@
    width = widthA;
    nComps = nCompsA;
    nBits = nBitsA;
 +  predLine = NULL;
 +  ok = gFalse;
  
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++      nComps >= INT_MAX / nBits ||
++      width >= INT_MAX / nComps / nBits)
++    return;
++
    nVals = width * nComps;
-+  totalBits = nVals * nBits;
-+  if (totalBits == 0 ||
-+      (totalBits / nBits) / nComps != width ||
-+      totalBits + 7 < 0) {
++  if (nVals * nBits + 7 <= 0)
 +    return;
-+  }
    pixBytes = (nComps * nBits + 7) >> 3;
--  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
+   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++  if (rowBytes < 0)
 +    return;
-+  }
++
    predLine = (Guchar *)gmalloc(rowBytes);
    memset(predLine, 0, rowBytes);
    predIdx = rowBytes;
@@ -98,22 +178,69 @@
    } else {
      pred = NULL;
    }
-@@ -2903,6 +2922,14 @@
+@@ -1258,7 +1277,7 @@
+   endOfLine = endOfLineA;
+   byteAlign = byteAlignA;
+   columns = columnsA;
+-  if (columns < 1) {
++  if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) {
+     columns = 1;
+   }
+   rows = rowsA;
+@@ -2903,7 +2922,12 @@
    height = read16();
    width = read16();
    numComps = str->getChar();
+-  if (prec != 8) {
 +  if (numComps <= 0 || numComps > 4) {
++    numComps = 0;
 +    error(getPos(), "Bad number of components in DCT stream", prec);
 +    return gFalse;
 +  }
++ if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+   }
+@@ -2929,6 +2953,11 @@
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
 +  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
++    numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
 +    return gFalse;
 +  }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
-@@ -3833,6 +3860,10 @@
+@@ -2951,6 +2980,11 @@
+ 
+   length = read16() - 2;
+   scanInfo.numComps = str->getChar();
++  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++    scanInfo.numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   --length;
+   if (length != 2 * scanInfo.numComps + 3) {
+     error(getPos(), "Bad DCT scan info block");
+@@ -3035,12 +3069,12 @@
+   while (length > 0) {
+     index = str->getChar();
+     --length;
+-    if ((index & 0x0f) >= 4) {
++    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
+       error(getPos(), "Bad DCT Huffman table");
+       return gFalse;
+     }
+     if (index & 0x10) {
+-      index &= 0x0f;
++      index &= 0x03;
+       if (index >= numACHuffTables)
+       numACHuffTables = index+1;
+       tbl = &acHuffTables[index];
+@@ -3833,6 +3867,10 @@
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
@@ -126,8 +253,8 @@
    }
 Index: kpdf/xpdf/xpdf/Stream.h
 ===================================================================
---- kpdf/xpdf/xpdf/Stream.h    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/xpdf/xpdf/Stream.h    (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kpdf/xpdf/xpdf/Stream.h    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/xpdf/Stream.h    (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -232,6 +232,8 @@
  
    ~StreamPredictor();
@@ -145,11 +272,37 @@
  };
  
  //------------------------------------------------------------------------
+Index: kpdf/xpdf/xpdf/Page.cc
+===================================================================
+--- kpdf/xpdf/xpdf/Page.cc     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/xpdf/Page.cc     (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
+@@ -66,6 +66,13 @@
+   if (!haveCropBox) {
+     cropBox = mediaBox;
+   }
++  else
++  {
++    // cropBox can not be bigger than mediaBox
++    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1 ||
++        cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
++          cropBox = mediaBox;
++  }
+ 
+   // other boxes
+   bleedBox = cropBox;
 Index: kpdf/xpdf/xpdf/JPXStream.cc
 ===================================================================
---- kpdf/xpdf/xpdf/JPXStream.cc        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/xpdf/xpdf/JPXStream.cc        (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
-@@ -783,7 +783,7 @@
+--- kpdf/xpdf/xpdf/JPXStream.cc        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/xpdf/JPXStream.cc        (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -783,7 +784,7 @@
    int segType;
    GBool haveSIZ, haveCOD, haveQCD, haveSOT;
    Guint precinctSize, style;
@@ -158,7 +311,7 @@
  
    //----- main header
    haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -818,8 +818,13 @@
+@@ -818,8 +819,13 @@
                    / img.xTileSize;
        img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
                    / img.yTileSize;
@@ -166,7 +319,7 @@
 -                                   sizeof(JPXTile));
 +      nTiles = img.nXTiles * img.nYTiles;
 +      // check for overflow before allocating memory
-+      if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) {
++      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / 
img.nYTiles) {
 +      error(getPos(), "Bad tile count in JPX SIZ marker segment");
 +      return gFalse;
 +      }
@@ -174,10 +327,40 @@
        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
        img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
                                                        sizeof(JPXTileComp));
+Index: kpdf/xpdf/goo/gmem.c
+===================================================================
+--- kpdf/xpdf/goo/gmem.c       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/xpdf/goo/gmem.c       (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <string.h>
++#include <limits.h>
+ #include "gmem.h"
+ 
+ #ifdef DEBUG_MEM
+@@ -141,7 +142,7 @@
+   int n;
+ 
+   n = nObjs * objSize;
+-  if (objSize == 0 || n / objSize != nObjs) {
++  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+     fprintf(stderr, "Bogus memory allocation size\n");
+     exit(1);
+   }
+@@ -152,7 +153,7 @@
+   int n;
+ 
+   n = nObjs * objSize;
+-  if (objSize == 0 || n / objSize != nObjs) {
++  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+     fprintf(stderr, "Bogus memory allocation size\n");
+     exit(1);
+   }
 Index: kpdf/shell/kpdf.desktop
 ===================================================================
---- kpdf/shell/kpdf.desktop    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/shell/kpdf.desktop    (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kpdf/shell/kpdf.desktop    (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/shell/kpdf.desktop    (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -5,7 +5,6 @@
  Name=KPDF
  Name[ar]=برنامج KPDF
@@ -194,10 +377,23 @@
  GenericName[zh_CN]=PDF 查看器
  GenericName[zu]=Umboniseli we PDF
  Exec=kpdf %U %i %m -caption "%c"
+Index: kpdf/part.rc
+===================================================================
+--- kpdf/part.rc       (.../tags/KDE/3.5.0/kdegraphics)        (revision 
488404)
++++ kpdf/part.rc       (.../branches/KDE/3.5/kdegraphics)      (revision 
488404)
+@@ -35,7 +35,7 @@
+     <Separator/>
+     <Action name="goto_page"/>
+   </Menu>
+-  <Menu name="mouseMode"><text>&amp;Tools</text>
++  <Menu name="tools"><text>&amp;Tools</text>
+     <Action name="mouse_drag"/>
+     <Action name="mouse_zoom"/>
+     <Action name="mouse_select"/>
 Index: kpdf/ui/presentationwidget.cpp
 ===================================================================
---- kpdf/ui/presentationwidget.cpp     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/ui/presentationwidget.cpp     (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kpdf/ui/presentationwidget.cpp     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/ui/presentationwidget.cpp     (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -171,12 +171,14 @@
  
  
@@ -215,8 +411,8 @@
  {
 Index: kpdf/ui/presentationwidget.h
 ===================================================================
---- kpdf/ui/presentationwidget.h       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kpdf/ui/presentationwidget.h       (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kpdf/ui/presentationwidget.h       (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kpdf/ui/presentationwidget.h       (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -46,7 +46,7 @@
  
      protected:
@@ -228,8 +424,8 @@
          void mousePressEvent( QMouseEvent * e );
 Index: kfaxview/kfaxmultipage_tiff.desktop
 ===================================================================
---- kfaxview/kfaxmultipage_tiff.desktop        
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kfaxview/kfaxmultipage_tiff.desktop        
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kfaxview/kfaxmultipage_tiff.desktop        
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kfaxview/kfaxmultipage_tiff.desktop        
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -3,7 +3,6 @@
  Name=kfaxview_tiff
  Name[da]=Kfaxview TIFF
@@ -258,8 +454,8 @@
  X-KDE-MimeTypes=image/tiff
 Index: kfaxview/kfaxmultipage.desktop
 ===================================================================
---- kfaxview/kfaxmultipage.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kfaxview/kfaxmultipage.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kfaxview/kfaxmultipage.desktop     (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kfaxview/kfaxmultipage.desktop     (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -1,10 +1,10 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -292,8 +488,8 @@
  X-KDE-MimeTypes=image/fax-g3
 Index: kfaxview/kfaxview.desktop
 ===================================================================
---- kfaxview/kfaxview.desktop  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kfaxview/kfaxview.desktop  (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kfaxview/kfaxview.desktop  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kfaxview/kfaxview.desktop  (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -52,14 +52,12 @@
  GenericName[ven]=Muvhoni wa Fekisi
  GenericName[wa]=HĂĽyneu di facs
@@ -311,8 +507,8 @@
  Exec=kfaxview %f
 Index: kview/kimageviewer/kimageviewercanvas.desktop
 ===================================================================
---- kview/kimageviewer/kimageviewercanvas.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kimageviewer/kimageviewercanvas.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kimageviewer/kimageviewercanvas.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kimageviewer/kimageviewercanvas.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -31,7 +31,7 @@
  Comment[nl]=Ingebed weergave-canvas (widget die een afbeelding toont)
  Comment[nn]=Inkluderbart lerret for biletvising (skjermelement som viser eit 
bilete)
@@ -332,8 +528,8 @@
  Comment[zu]=Inkalivasi Yombukisi Wesithombe Esixubeneyo (i-widget ekhombisa 
isithombe)
 Index: kview/kimageviewer/kimageviewer.desktop
 ===================================================================
---- kview/kimageviewer/kimageviewer.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kimageviewer/kimageviewer.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kimageviewer/kimageviewer.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kimageviewer/kimageviewer.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -34,7 +34,7 @@
  Comment[nl]=Ingebed weergavecomponent voor afbeeldingen
  Comment[nn]=Inkluderbart komponent for biletvising
@@ -353,8 +549,8 @@
  Comment[zu]=Ilunga Lombukisi Wesithombe Esixubeneyo
 Index: kview/kviewcanvas/config/kviewcanvasconfig.desktop
 ===================================================================
---- kview/kviewcanvas/config/kviewcanvasconfig.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kviewcanvas/config/kviewcanvasconfig.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kviewcanvas/config/kviewcanvasconfig.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kviewcanvas/config/kviewcanvasconfig.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -39,7 +39,7 @@
  Name[nl]=Weergaveprogramma
  Name[nn]=Framvisar
@@ -380,8 +576,8 @@
  Comment[zh_CN]=KViewCanvas 常规配置
 Index: kview/kviewcanvas/kviewcanvas.desktop
 ===================================================================
---- kview/kviewcanvas/kviewcanvas.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kviewcanvas/kviewcanvas.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kviewcanvas/kviewcanvas.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kviewcanvas/kviewcanvas.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -30,7 +30,7 @@
  Name[nl]=KView afbeeldingwidget
  Name[nn]=KView biletvisarelement
@@ -401,8 +597,8 @@
  Name[zu]=I-widget Yombukisi Wesithombe se-KView
 Index: kview/kview.desktop
 ===================================================================
---- kview/kview.desktop        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kview/kview.desktop        (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kview/kview.desktop        (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kview/kview.desktop        (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -62,7 +62,6 @@
  GenericName[ven]=Tshivhoni tsha Mutaleli
  GenericName[wa]=Hüyneu d' imüdjes
@@ -428,8 +624,8 @@
  X-KDE-StartupNotify=true
 Index: kview/photobook/photobook.desktop
 ===================================================================
---- kview/photobook/photobook.desktop  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kview/photobook/photobook.desktop  (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kview/photobook/photobook.desktop  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kview/photobook/photobook.desktop  (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -29,7 +29,6 @@
  GenericName[sv]=Fotoalbum
  GenericName[ta]=புகைப்படப் புத்தகம்
@@ -456,8 +652,8 @@
  X-KDE-Library=libphotobook
 Index: kview/config/kviewgeneralconfig.desktop
 ===================================================================
---- kview/config/kviewgeneralconfig.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/config/kviewgeneralconfig.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/config/kviewgeneralconfig.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/config/kviewgeneralconfig.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -68,7 +68,6 @@
  Name[ven]=Apulifikhesheni
  Name[wa]=Programe
@@ -474,8 +670,8 @@
  Comment[zh_CN]=KView 标准版本的配置
 Index: kview/config/plugins/kviewpluginsconfig.desktop
 ===================================================================
---- kview/config/plugins/kviewpluginsconfig.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/config/plugins/kviewpluginsconfig.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/config/plugins/kviewpluginsconfig.desktop    
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/config/plugins/kviewpluginsconfig.desktop    
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -56,7 +56,6 @@
  Name[uk]=Втулки
  Name[uz]=Плагинлар
@@ -492,8 +688,8 @@
  Comment[zh_CN]=选择并配置您的插件
 Index: kview/config/kview.setdlg
 ===================================================================
---- kview/config/kview.setdlg  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 486886)
-+++ kview/config/kview.setdlg  (.../branches/KDE/3.5/kdegraphics)      
(revision 486886)
+--- kview/config/kview.setdlg  (.../tags/KDE/3.5.0/kdegraphics)        
(revision 488404)
++++ kview/config/kview.setdlg  (.../branches/KDE/3.5/kdegraphics)      
(revision 488404)
 @@ -26,7 +26,7 @@
  Name[nl]=Weergaveprogramma
  Name[nn]=Framvisar
@@ -536,8 +732,8 @@
  Weight=5
 Index: kview/kviewviewer/kviewviewer.desktop
 ===================================================================
---- kview/kviewviewer/kviewviewer.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kviewviewer/kviewviewer.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kviewviewer/kviewviewer.desktop      
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kviewviewer/kviewviewer.desktop      
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -32,7 +32,7 @@
  Comment[nn]=Biletvisardel for KDE
  Comment[nso]=Seripa sa Molebeledi wa Ponagalo sa KDE
@@ -565,8 +761,8 @@
  InitialPreference=3
 Index: kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
 ===================================================================
---- kview/kviewviewer/config/kviewviewerpluginsconfig.desktop  
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/kviewviewer/config/kviewviewerpluginsconfig.desktop  
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/kviewviewer/config/kviewviewerpluginsconfig.desktop  
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/kviewviewer/config/kviewviewerpluginsconfig.desktop  
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -56,7 +56,6 @@
  Name[uk]=Втулки
  Name[uz]=Плагинлар
@@ -583,8 +779,8 @@
  Comment[zh_CN]=选择并配置您的插件
 Index: kview/modules/effects/kvieweffects.desktop
 ===================================================================
---- kview/modules/effects/kvieweffects.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/modules/effects/kvieweffects.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/modules/effects/kvieweffects.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/modules/effects/kvieweffects.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -54,7 +54,6 @@
  Name[uk]=Ефекти
  Name[uz]=Эффектлар
@@ -601,8 +797,8 @@
  Comment[zh_CN]=提供某些图像特效
 Index: kview/modules/browser/kviewbrowser.desktop
 ===================================================================
---- kview/modules/browser/kviewbrowser.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/modules/browser/kviewbrowser.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/modules/browser/kviewbrowser.desktop 
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/modules/browser/kviewbrowser.desktop 
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -61,7 +61,6 @@
  Name[ven]=Burausa
  Name[wa]=Foyteuse
@@ -621,8 +817,8 @@
  Comment[zu]=Ikuvumela ukuba ucinge ngokwedlulela izithombe ohlwini 
lwamafayela lwamanje.
 Index: kview/modules/presenter/config/kviewpresenterconfig.desktop
 ===================================================================
---- kview/modules/presenter/config/kviewpresenterconfig.desktop        
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/modules/presenter/config/kviewpresenterconfig.desktop        
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/modules/presenter/config/kviewpresenterconfig.desktop        
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/modules/presenter/config/kviewpresenterconfig.desktop        
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -51,7 +51,6 @@
  Name[uk]=Назва
  Name[uz]=Номи
@@ -639,8 +835,8 @@
  Comment[zh_CN]=注释
 Index: kview/modules/presenter/kviewpresenter.desktop
 ===================================================================
---- kview/modules/presenter/kviewpresenter.desktop     
(.../tags/KDE/3.5.0/kdegraphics)        (revision 486886)
-+++ kview/modules/presenter/kviewpresenter.desktop     
(.../branches/KDE/3.5/kdegraphics)      (revision 486886)
+--- kview/modules/presenter/kviewpresenter.desktop     
(.../tags/KDE/3.5.0/kdegraphics)        (revision 488404)
++++ kview/modules/presenter/kviewpresenter.desktop     
(.../branches/KDE/3.5/kdegraphics)      (revision 488404)
 @@ -53,7 +53,6 @@
  Name[tr]=Sunum AracÄą
  Name[ven]=Mulanguli
@@ -659,8 +855,8 @@
  Comment[zu]=Idala uhlu lwesithombe futhi ikuvumela wena ukuba udale umbukiso 
wesithombe esishibilikayo
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdegraphics-branch.diff?r1=1.8&r2=1.9&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit