Changeset 146206 in webkit

Timestamp:

Mar 19, 2013, 8:39:46 AM (12 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Make ImageDiff similar to Chromium's ImageDiff
​https://bugs.webkit.org/show_bug.cgi?id=94782

Based on patch by Csaba Osztrogonác.
Reviewed by Jocelyn Turcotte.

The diff image is generated with bright red indicating errors, but letting the base image
shine through so the context of the error-pixel can be identified.

• DumpRenderTree/qt/ImageDiff.cpp:

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• ImageDiff/qt/ImageDiff.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-19  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Make ImageDiff similar to Chromium's ImageDiff
+        https://bugs.webkit.org/show_bug.cgi?id=94782
+
+        Based on patch by Csaba Osztrogonác.
+        Reviewed by Jocelyn Turcotte.
+
+        The diff image is generated with bright red indicating errors, but letting the base image
+        shine through so the context of the error-pixel can be identified.
+
+        * DumpRenderTree/qt/ImageDiff.cpp:
+        (main):
+
 2013-03-18  Andras Becsi  <andras.becsi@digia.com>
 

trunk/Tools/ImageDiff/qt/ImageDiff.cpp

@@ -32 +32 @@
     QCoreApplication app(argc, argv);
 
-    qreal tolerance = 0;
+    qreal tolerance = 0; // Tolerated percentage of error pixels.
 
     QStringList args = app.arguments();
@@ -94 +94 @@
                 QImage diffImage(w, h, QImage::Format_ARGB32);
 
-                int count = 0;
-                qreal sum = 0;
-                qreal maxDistance = 0;
+                int errorCount = 0;
 
-                for (int x = 0; x < w; ++x)
+                for (int x = 0; x < w; ++x) {
                     for (int y = 0; y < h; ++y) {
                         QRgb pixel = actualImage.pixel(x, y);
@@ -107 +105 @@
                         qreal alpha = (qAlpha(pixel) - qAlpha(basePixel)) / static_cast<float>(qMax(255 - qAlpha(basePixel), qAlpha(basePixel)));
                         qreal distance = qSqrt(red * red + green * green + blue * blue + alpha * alpha) / 2.0f;
-                        int gray = distance * qreal(255);
-                        diffImage.setPixel(x, y, qRgb(gray, gray, gray));
                         if (distance >= 1 / qreal(255)) {
-                            count++;
-                            sum += distance;
-                            maxDistance = qMax(maxDistance, distance);
-                        }
+                            errorCount++;
+                            diffImage.setPixel(x, y, qRgb(255, 0, 0));
+                        } else
+                            diffImage.setPixel(x, y, qRgba(qRed(basePixel), qGreen(basePixel), qBlue(basePixel), qAlpha(basePixel) * 0.5));
+                    }
                 }
 
                 qreal difference = 0;
-                if (count)
-                    difference = 100 * sum / static_cast<qreal>(w * h);
-                if (difference <= tolerance) {
-                    difference = 0;
-                } else {
-                    difference = qRound(difference * 100) / 100.0f;
-                    difference = qMax(difference, qreal(0.01));
-                }
+                if (errorCount)
+                    difference = 100 * errorCount / static_cast<qreal>(w * h);
 
-                if (!difference)
+                if (difference <= tolerance)
                     fprintf(stdout, "diff: %01.2f%% passed\n", difference);
                 else {