summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiodecoder
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-14 10:31:01 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-17 18:55:55 +0200
commit3111178ee600558b8d3280ce5c1397e77ccc7f5f (patch)
tree899c85e47a2880bbda6f4f9972050122466d4ffb /examples/multimedia/audiodecoder
parent992a1b260550ff6e2ad524f63ad53d7edbbcfccd (diff)
Remove Q_PACKED from structs that don't need to be packed
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>
Diffstat (limited to 'examples/multimedia/audiodecoder')
-rw-r--r--examples/multimedia/audiodecoder/wavefilewriter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/multimedia/audiodecoder/wavefilewriter.cpp b/examples/multimedia/audiodecoder/wavefilewriter.cpp
index 56248a0d6..c3abc158d 100644
--- a/examples/multimedia/audiodecoder/wavefilewriter.cpp
+++ b/examples/multimedia/audiodecoder/wavefilewriter.cpp
@@ -40,19 +40,19 @@
#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;