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

List:       kde-commits
Subject:    KDE/kdelibs/kimgio
From:       Roberto Raggi <roberto () kdevelop ! org>
Date:       2007-02-21 13:54:33
Message-ID: 1172066073.077074.22288.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 635955 by raggi:

Compile.


 M  +19 -9     pcx.cpp  
 M  +14 -12    pcx.h  


--- trunk/KDE/kdelibs/kimgio/pcx.cpp #635954:635955
@@ -15,7 +15,12 @@
 
 static QDataStream &operator>>( QDataStream &s, RGB &rgb )
 {
-  s >> rgb.r >> rgb.g >> rgb.b;
+  quint8 r, g, b;
+  
+  s >> r >> g >> b;
+  rgb.r = r;
+  rgb.g = g;
+  rgb.b = b;
 
   return s;
 }
@@ -30,10 +35,12 @@
 
 static QDataStream &operator>>( QDataStream &s, PCXHEADER &ph )
 {
-  s >> ph.Manufacturer;
-  s >> ph.Version;
-  s >> ph.Encoding;
-  s >> ph.Bpp;
+  quint8 m, ver, enc, bpp;
+  s >> m >> ver >> enc >> bpp;
+  ph.Manufacturer = m;
+  ph.Version = ver;
+  ph.Encoding = enc;
+  ph.Bpp = bpp;
   quint16 xmin, ymin, xmax, ymax;
   s >> xmin >> ymin >> xmax >> ymax;
   ph.XMin = xmin;
@@ -44,9 +51,12 @@
   s >> hdpi >> ydpi;
   ph.HDpi = hdpi;
   ph.YDpi = ydpi;
-  s >> ph.ColorMap;
-  s >> ph.Reserved;
-  s >> ph.NPlanes;
+  Palette colorMap;
+  quint8 res, np;
+  s >> colorMap >> res >> np;
+  ph.ColorMap = colorMap;
+  ph.Reserved = res;
+  ph.NPlanes = np;
   quint16 bytesperline;
   s >> bytesperline; ph.BytesPerLine = bytesperline;
   quint16 paletteinfo;
@@ -387,7 +397,7 @@
 
   // Write palette
   for ( int i=0; i<256; ++i )
-    s << RGB( img.color( i ) );
+    s << RGB::from( img.color( i ) );
 }
 
 static void writeImage24( QImage &img, QDataStream &s, PCXHEADER &header )
--- trunk/KDE/kdelibs/kimgio/pcx.h #635954:635955
@@ -33,28 +33,30 @@
 class RGB
 {
   public:
-    RGB() { }
-
-    RGB( const QRgb color )
+    quint8 r;
+    quint8 g;
+    quint8 b;
+    
+    static RGB from( const QRgb &color)
     {
-      r = qRed( color );
-      g = qGreen( color );
-      b = qBlue( color );
+      RGB c;
+      c.r = qRed( color );
+      c.g = qGreen( color );
+      c.b = qBlue( color );
+      return c;
     }
 
-    quint8 r;
-    quint8 g;
-    quint8 b;
 } KDE_PACKED;
 
 class Palette
 {
   public:
-    Palette() { }
-
     void setColor( int i, const QRgb color )
     {
-      rgb[ i ] = RGB( color );
+      RGB &c = rgb[ i ];
+      c.r = qRed( color );
+      c.g = qGreen( color );
+      c.b = qBlue( color );
     }
 
     QRgb color( int i ) const
[prev in list] [next in list] [prev in thread] [next in thread]