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

List:       kde-commits
Subject:    kdenonbeta/kdom/cache/imload
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-02-18 18:18:54
Message-ID: 1140286734.277352.26402.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 511052 by wildfox:

Sync with kdelibs4_snapshot version of imload


 M  +1 -1      animtimer.h  
 M  +1 -1      decoders/gifloader.cpp  
 M  +1 -1      decoders/gifloader.h  
 M  +1 -1      decoders/jpegloader.cpp  
 M  +6 -2      image.cpp  
 M  +1 -1      imageloaderprovider.h  
 M  +1 -1      imageowner.h  
 M  +2 -0      imageplane.cpp  
 M  +1 -1      loaderdatabase.h  
 M  +2 -2      pixmapplane.cpp  
 M  +1 -1      rawimageplane.cpp  
 M  +3 -3      scaledimageplane.cpp  
 M  +1 -1      tile.h  
 M  +2 -1      tilecache.h  
 M  +4 -2      updater.h  


--- trunk/kdenonbeta/kdom/cache/imload/animtimer.h #511051:511052
@@ -50,7 +50,7 @@
     void nextFrameIn(AnimProvider* provider, int ms);
     
     void destroyed(AnimProvider* provider);
-private slots:
+private Q_SLOTS:
     void tick();
 private:
     QMap<AnimProvider*, int> pending;
--- trunk/kdenonbeta/kdom/cache/imload/decoders/gifloader.cpp #511051:511052
@@ -40,7 +40,7 @@
 #include <config.h> //For endian
 extern "C" {
 #include <gif_lib.h>
-};
+}
 namespace khtmlImLoad {
 
 static int INTERLACED_OFFSET[] = { 0, 4, 2, 1 };
--- trunk/kdenonbeta/kdom/cache/imload/decoders/gifloader.h #511051:511052
@@ -10,7 +10,7 @@
 class GIFLoaderProvider: public ImageLoaderProvider
 {
 public:
-    virtual ~GIFLoaderProvider(){};
+    virtual ~GIFLoaderProvider(){}
     virtual Type type();
 
     virtual ImageLoader* loaderFor(const QByteArray& prefix);
--- trunk/kdenonbeta/kdom/cache/imload/decoders/jpegloader.cpp #511051:511052
@@ -400,7 +400,7 @@
             return consumed;
         }
         uchar* lines[1] = {scanline};
-        //int oldoutput_scanline = cinfo.output_scanline; // Not used? englich
+        // int oldoutput_scanline = cinfo.output_scanline;
 
         //Decode and feed line-by-line
         while(cinfo.output_scanline < cinfo.output_height)
--- trunk/kdenonbeta/kdom/cache/imload/image.cpp #511051:511052
@@ -359,7 +359,9 @@
     }
     else
     {
-//#warning "Security paranoia needed here"
+#ifdef __GNUC__
+#warning "Security paranoia needed here"
+#endif
         //Compute scaling ratios
         double wRatio = size.width()  / double(width);
         double hRatio = size.height() / double(height);
@@ -389,7 +391,9 @@
 
         first->refCount = 1;
         scaled[key]     = first;
-//#warning "FIXME: Clone animation controllers"
+#ifdef __GNUC__
+#warning "FIXME: Clone animation controllers"
+#endif
     }
 }
 
--- trunk/kdenonbeta/kdom/cache/imload/imageloaderprovider.h #511051:511052
@@ -37,7 +37,7 @@
 class ImageLoaderProvider
 {
 public:
-    virtual ~ImageLoaderProvider(){};
+    virtual ~ImageLoaderProvider(){}
     enum Type
     {
         Efficient,
--- trunk/kdenonbeta/kdom/cache/imload/imageowner.h #511051:511052
@@ -35,7 +35,7 @@
 class ImageOwner
 {
 public:
-    virtual ~ImageOwner() {};
+    virtual ~ImageOwner() {}
     /**
      Called to notify the owner when the intrinic size is available
 
--- trunk/kdenonbeta/kdom/cache/imload/imageplane.cpp #511051:511052
@@ -95,6 +95,8 @@
                                tile->pixmap.width(),
                                tile->pixmap.height());
 
+            //Note: we're copying the entire tile-size here,
+            //and not just the dirty portion. 
             QImage portion = image.copy(imagePortion);
             tile->pixmap.fill(Qt::transparent);
             QPainter p(&tile->pixmap);
--- trunk/kdenonbeta/kdom/cache/imload/loaderdatabase.h #511051:511052
@@ -35,7 +35,7 @@
 class LoaderDatabase
 {
 public:
-    LoaderDatabase() {};
+    LoaderDatabase() {}
     
     unsigned int numLoaders()
     {
--- trunk/kdenonbeta/kdom/cache/imload/pixmapplane.cpp #511051:511052
@@ -32,9 +32,9 @@
                   int sx, int sy, int sWidth, int sHeight)
 {
     //Do some basic clipping, discarding invalid requests and adjusting sizes of others
-    if (sy >= height)
+    if (sy >= (int)height)
         return;
-    if (sx >= width)
+    if (sx >= (int)width)
         return;
 
     if (sWidth == -1)
--- trunk/kdenonbeta/kdom/cache/imload/rawimageplane.cpp #511051:511052
@@ -25,7 +25,7 @@
 
 namespace khtmlImLoad {
 
-bool RawImagePlane::isUpToDate(unsigned int /*tileX*/, unsigned int tileY,
+bool RawImagePlane::isUpToDate(unsigned int /* tileX */, unsigned int tileY,
                             PixmapTile* tile)
 {
     return checkUpToDate(versions + tileY * Tile::TileSize, tile);
--- trunk/kdenonbeta/kdom/cache/imload/scaledimageplane.cpp #511051:511052
@@ -26,7 +26,7 @@
 
 namespace khtmlImLoad {
 
-bool ScaledImagePlane::isUpToDate(unsigned int /*tileX*/, unsigned int tileY,
+bool ScaledImagePlane::isUpToDate(unsigned int /* tileX */, unsigned int tileY,
                             PixmapTile* tile)
 {
     if (tile->pixmap.isNull()) return false;
@@ -42,13 +42,13 @@
 
 template<typename T>
 static void scaleLoop(QImage* dst, unsigned int* xScaleTable,
-                      int line, const QImage& src, int srcLine, int tileX, int /*tileY*/)
+                      int line, const QImage& src, int srcLine, int tileX, int /* tileY */)
 {
     const T* srcPix = reinterpret_cast<const T*>(src.scanLine (srcLine));
     T*       dstPix = reinterpret_cast<T*>(dst->scanLine(line));
     
     xScaleTable += tileX * Tile::TileSize;
-    for (int x = 0; x < dst->width(); ++x)
+    for (int x = 0; x < (int)dst->width(); ++x)
     {
         *dstPix = srcPix[xScaleTable[x]];
         ++dstPix;
--- trunk/kdenonbeta/kdom/cache/imload/tile.h #511051:511052
@@ -56,7 +56,7 @@
     {
         std::memset(versions, 0, Tile::TileSize);
     }
-    virtual ~Tile(){};
+    virtual ~Tile(){}
     virtual void discard() = 0;
 
     TileCacheNode* cacheNode;
--- trunk/kdenonbeta/kdom/cache/imload/tilecache.h #511051:511052
@@ -32,8 +32,9 @@
 namespace khtmlImLoad {
 
 
-struct TileCacheNode
+class TileCacheNode
 {
+public:
     //Interface to the cache LRU chains
     TileCacheNode* cacheNext;
     TileCacheNode* cachePrev;
--- trunk/kdenonbeta/kdom/cache/imload/updater.h #511051:511052
@@ -32,7 +32,9 @@
 
 class Image;
 
-//#warning "FIXME: this can dangle pointers!"
+#ifdef __GNUC__
+#warning "FIXME: this can dangle pointers!"
+#endif
 /**
  The updater class helps manage timers, to permit update messages to be coalesced (so we don't 
  bug KHTML, or whatever use every 5 pico-seconds.
@@ -49,7 +51,7 @@
      amount of time has passed.
      */
     void haveUpdates(Image* frame);
-private slots:
+private Q_SLOTS:
     void pushUpdates();
 private:
     QVector<Image*> frames[10];
[prev in list] [next in list] [prev in thread] [next in thread]