<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192728] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192728">192728</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-22 00:53:56 -0800 (Sun, 22 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] ImageDiff should normalize the diff image
https://bugs.webkit.org/show_bug.cgi?id=151261
Reviewed by Sergio Villar Senin.
* ImageDiff/gtk/ImageDiff.cpp:
(readPixbufFromStdin): Fix memory leak.
(differenceImageFromDifferenceBuffer): Normalize diff buffer.
(calculateDifference): Pass max distance to differenceImageFromDifferenceBuffer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsImageDiffgtkImageDiffcpp">trunk/Tools/ImageDiff/gtk/ImageDiff.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192727 => 192728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-22 08:50:40 UTC (rev 192727)
+++ trunk/Tools/ChangeLog 2015-11-22 08:53:56 UTC (rev 192728)
</span><span class="lines">@@ -1 +1,13 @@
</span><ins>+2015-11-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] ImageDiff should normalize the diff image
+ https://bugs.webkit.org/show_bug.cgi?id=151261
+
+ Reviewed by Sergio Villar Senin.
+
+ * ImageDiff/gtk/ImageDiff.cpp:
+ (readPixbufFromStdin): Fix memory leak.
+ (differenceImageFromDifferenceBuffer): Normalize diff buffer.
+ (calculateDifference): Pass max distance to differenceImageFromDifferenceBuffer.
+
</ins><span class="cx"> == Rolled over to ChangeLog-2015-11-21 ==
</span></span></pre></div>
<a id="trunkToolsImageDiffgtkImageDiffcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ImageDiff/gtk/ImageDiff.cpp (192727 => 192728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ImageDiff/gtk/ImageDiff.cpp 2015-11-22 08:50:40 UTC (rev 192727)
+++ trunk/Tools/ImageDiff/gtk/ImageDiff.cpp 2015-11-22 08:53:56 UTC (rev 192728)
</span><span class="lines">@@ -64,23 +64,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gdk_pixbuf_loader_close(loader, 0);
</span><del>- GdkPixbuf* decodedImage = gdk_pixbuf_loader_get_pixbuf(loader);
- g_object_ref(decodedImage);
</del><ins>+ GdkPixbuf* decodedImage = GDK_PIXBUF(g_object_ref(gdk_pixbuf_loader_get_pixbuf(loader)));
+ g_object_unref(loader);
</ins><span class="cx"> return decodedImage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GdkPixbuf* differenceImageFromDifferenceBuffer(unsigned char* buffer, int width, int height)
</del><ins>+GdkPixbuf* differenceImageFromDifferenceBuffer(unsigned char* buffer, int width, int height, float maxDistance)
</ins><span class="cx"> {
</span><span class="cx"> GdkPixbuf* image = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
</span><span class="cx"> if (!image)
</span><span class="cx"> return image;
</span><span class="cx">
</span><ins>+ bool shouldNormalize = maxDistance > 0 && maxDistance < 1;
</ins><span class="cx"> int rowStride = gdk_pixbuf_get_rowstride(image);
</span><span class="cx"> unsigned char* diffPixels = gdk_pixbuf_get_pixels(image);
</span><span class="cx"> for (int x = 0; x < width; x++) {
</span><span class="cx"> for (int y = 0; y < height; y++) {
</span><span class="cx"> unsigned char* diffPixel = diffPixels + (y * rowStride) + (x * 3);
</span><del>- diffPixel[0] = diffPixel[1] = diffPixel[2] = *buffer++;
</del><ins>+ unsigned char bufferPixel = *buffer++;
+ if (shouldNormalize)
+ bufferPixel /= maxDistance;
+ diffPixel[0] = diffPixel[1] = diffPixel[2] = bufferPixel;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,7 +145,7 @@
</span><span class="cx"> else {
</span><span class="cx"> difference = roundf(difference * 100.0f) / 100.0f;
</span><span class="cx"> difference = max(difference, 0.01f); // round to 2 decimal places
</span><del>- *differenceImage = differenceImageFromDifferenceBuffer(diffBuffer, width, height);
</del><ins>+ *differenceImage = differenceImageFromDifferenceBuffer(diffBuffer, width, height, maxDistance);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(diffBuffer);
</span></span></pre>
</div>
</div>
</body>
</html>