Baseline test framework: fix bug in internal data structure

The 'misc' data field was not copied in the assignment operator. That field is normally not used, so this bug went undiscovered for a long time. But in certain cases, the bug would cause an image size mismatch to be reported as just a normal mismatch. Fix the source of the problem by following the rule of zero - the compiler generated special functions are just fine for this value type. Done-With: Volker Hilsheimer <[email protected]> Change-Id: I8fc8d32d1b83b78cd4ef3f4ec9a8f22661b0e025 Reviewed-by: Eirik Aavitsland <[email protected]> Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit 5cd3571) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
snooter101 · Feb 1, 2022 · db852d6 · db852d6
1 parent 63479f0
commit db852d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/tests/baseline/shared/baselineprotocol.cpp b/tests/baseline/shared/baselineprotocol.cpp
@@ -141,17 +141,6 @@ QDataStream & operator>> (QDataStream &stream, PlatformInfo &pi)
 }
 
 
-ImageItem &ImageItem::operator=(const ImageItem &other)
-{
-    testFunction = other.testFunction;
-    itemName = other.itemName;
-    itemChecksum = other.itemChecksum;
-    status = other.status;
-    image = other.image;
-    imageChecksums = other.imageChecksums;
-    return *this;
-}
-
 // Defined in lookup3.c:
 void hashword2 (
 const quint32 *k,         /* the key, an array of quint32 values */

diff --git a/tests/baseline/shared/baselineprotocol.h b/tests/baseline/shared/baselineprotocol.h
@@ -76,16 +76,6 @@ QDataStream & operator>> (QDataStream &stream, PlatformInfo& pi);
 
 struct ImageItem
 {
-public:
-    ImageItem()
-        : status(Ok), itemChecksum(0)
-    {}
-    ImageItem(const ImageItem &other)
-    { *this = other; }
-    ~ImageItem()
-    {}
-    ImageItem &operator=(const ImageItem &other);
-
     static quint64 computeChecksum(const QImage& image);
 
     enum ItemStatus {
@@ -99,10 +89,10 @@ struct ImageItem
 
     QString testFunction;
     QString itemName;
-    ItemStatus status;
+    ItemStatus status = Ok;
     QImage image;
     QList<quint64> imageChecksums;
-    quint16 itemChecksum;
+    quint16 itemChecksum = 0;
     QByteArray misc;
 
     void writeImageToStream(QDataStream &stream) const;