From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Tools/ImageDiff/gtk/ImageDiff.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'Tools/ImageDiff/gtk') diff --git a/Tools/ImageDiff/gtk/ImageDiff.cpp b/Tools/ImageDiff/gtk/ImageDiff.cpp index 2cb9f3bce..5a128d1e3 100644 --- a/Tools/ImageDiff/gtk/ImageDiff.cpp +++ b/Tools/ImageDiff/gtk/ImageDiff.cpp @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -63,23 +64,27 @@ GdkPixbuf* readPixbufFromStdin(long imageSize) } gdk_pixbuf_loader_close(loader, 0); - GdkPixbuf* decodedImage = gdk_pixbuf_loader_get_pixbuf(loader); - g_object_ref(decodedImage); + GdkPixbuf* decodedImage = GDK_PIXBUF(g_object_ref(gdk_pixbuf_loader_get_pixbuf(loader))); + g_object_unref(loader); return decodedImage; } -GdkPixbuf* differenceImageFromDifferenceBuffer(unsigned char* buffer, int width, int height) +GdkPixbuf* differenceImageFromDifferenceBuffer(unsigned char* buffer, int width, int height, float maxDistance) { GdkPixbuf* image = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height); if (!image) return image; + bool shouldNormalize = maxDistance > 0 && maxDistance < 1; int rowStride = gdk_pixbuf_get_rowstride(image); unsigned char* diffPixels = gdk_pixbuf_get_pixels(image); for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { unsigned char* diffPixel = diffPixels + (y * rowStride) + (x * 3); - diffPixel[0] = diffPixel[1] = diffPixel[2] = *buffer++; + unsigned char bufferPixel = *buffer++; + if (shouldNormalize) + bufferPixel /= maxDistance; + diffPixel[0] = diffPixel[1] = diffPixel[2] = bufferPixel; } } @@ -140,7 +145,7 @@ float calculateDifference(GdkPixbuf* baselineImage, GdkPixbuf* actualImage, GdkP else { difference = roundf(difference * 100.0f) / 100.0f; difference = max(difference, 0.01f); // round to 2 decimal places - *differenceImage = differenceImageFromDifferenceBuffer(diffBuffer, width, height); + *differenceImage = differenceImageFromDifferenceBuffer(diffBuffer, width, height, maxDistance); } free(diffBuffer); -- cgit v1.2.1