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

List:       kde-commits
Subject:    KDE/kdelibs/kimgio
From:       David Faure <faure () kde ! org>
Date:       2007-02-21 12:52:54
Message-ID: 1172062374.083135.16298.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 635940 by dfaure:

Fix compilation and fix
warning: ignoring packed attribute because of unpacked non-POD field ‘Palette PCXHEADER::ColorMap'


 M  +17 -6     pcx.cpp  
 M  +2 -2      pcx.h  


--- trunk/KDE/kdelibs/kimgio/pcx.cpp #635939:635940
@@ -34,15 +34,26 @@
   s >> ph.Version;
   s >> ph.Encoding;
   s >> ph.Bpp;
-  s >> ph.XMin >> ph.YMin >> ph.XMax >> ph.YMax;
-  s >> ph.HDpi >> ph.YDpi;
+  quint16 xmin, ymin, xmax, ymax;
+  s >> xmin >> ymin >> xmax >> ymax;
+  ph.XMin = xmin;
+  ph.YMin = ymin;
+  ph.XMax = xmax;
+  ph.YMax = ymax;
+  quint16 hdpi, ydpi;
+  s >> hdpi >> ydpi;
+  ph.HDpi = hdpi;
+  ph.YDpi = ydpi;
   s >> ph.ColorMap;
   s >> ph.Reserved;
   s >> ph.NPlanes;
-  s >> ph.BytesPerLine;
-  s >> ph.PaletteInfo;
-  s >> ph.HScreenSize;
-  s >> ph.VScreenSize;
+  quint16 bytesperline;
+  s >> bytesperline; ph.BytesPerLine = bytesperline;
+  quint16 paletteinfo;
+  s >> paletteinfo; ph.PaletteInfo = paletteinfo;
+  quint16 hscreensize, vscreensize;
+  s >> hscreensize; ph.HScreenSize = hscreensize;
+  s >> vscreensize; ph.VScreenSize = vscreensize;
 
   // Skip the rest of the header
   quint8 byte;
--- trunk/KDE/kdelibs/kimgio/pcx.h #635939:635940
@@ -45,7 +45,7 @@
     quint8 r;
     quint8 g;
     quint8 b;
-};
+} KDE_PACKED;
 
 class Palette
 {
@@ -63,7 +63,7 @@
     }
 
     class RGB rgb[ 16 ];
-};
+} KDE_PACKED;
 
 class PCXHEADER
 {
[prev in list] [next in list] [prev in thread] [next in thread]