Remove Q_PACKED from structs that don't need to be packed
authorThiago Macieira <thiago.macieira@intel.com>
Sat, 14 Sep 2013 17:31:01 +0000 (10:31 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 17 Sep 2013 16:55:55 +0000 (18:55 +0200)
Those classes don't contain padding, they don't need to be packed. The
only reason to be packed was to deal with bad alignment of the WAV
file.

Since Q_PACKED wasn't present in all compilers, this might have been a
latent bug. If that was the case, then force it to happen with more
compilers.

Change-Id: I8449b6bab5d62c1b7e08b9bc205b4b149ed55e28
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
examples/multimedia/audiodecoder/wavefilewriter.cpp

index 56248a0..c3abc15 100644 (file)
 
 #include "wavefilewriter.h"
 
-struct Q_PACKED chunk
+struct chunk
 {
     char        id[4];
     quint32     size;
 };
 
-struct Q_PACKED RIFFHeader
+struct RIFFHeader
 {
     chunk       descriptor;     // "RIFF"
     char        type[4];        // "WAVE"
 };
 
-struct Q_PACKED WAVEHeader
+struct WAVEHeader
 {
     chunk       descriptor;
     quint16     audioFormat;
@@ -63,12 +63,12 @@ struct Q_PACKED WAVEHeader
     quint16     bitsPerSample;
 };
 
-struct Q_PACKED DATAHeader
+struct DATAHeader
 {
     chunk       descriptor;
 };
 
-struct Q_PACKED CombinedHeader
+struct CombinedHeader
 {
     RIFFHeader  riff;
     WAVEHeader  wave;