<!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>[235929] 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/235929">235929</a></dd>
<dt>Author</dt> <dd>Hironori.Fujii@sony.com</dd>
<dt>Date</dt> <dd>2018-09-11 21:50:09 -0700 (Tue, 11 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win][Clang][ImageDiff] Fix compilation error and warning of PlatformImageCairo.cpp
https://bugs.webkit.org/show_bug.cgi?id=189496

Reviewed by Alex Christensen.

* ImageDiff/cairo/PlatformImageCairo.cpp:
(ImageDiff::PlatformImage::createFromStdin): Removed unnecessary ReadContext struct.
(ImageDiff::PlatformImage::writeAsPNGToStdout): Use '%lu' format type specifier for unsigned long.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsImageDiffcairoPlatformImageCairocpp">trunk/Tools/ImageDiff/cairo/PlatformImageCairo.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (235928 => 235929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-09-12 02:42:35 UTC (rev 235928)
+++ trunk/Tools/ChangeLog       2018-09-12 04:50:09 UTC (rev 235929)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-09-11  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang][ImageDiff] Fix compilation error and warning of PlatformImageCairo.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=189496
+
+        Reviewed by Alex Christensen.
+
+        * ImageDiff/cairo/PlatformImageCairo.cpp:
+        (ImageDiff::PlatformImage::createFromStdin): Removed unnecessary ReadContext struct.
+        (ImageDiff::PlatformImage::writeAsPNGToStdout): Use '%lu' format type specifier for unsigned long.
+
</ins><span class="cx"> 2018-09-07  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add and expose Internal features from WebKit
</span></span></pre></div>
<a id="trunkToolsImageDiffcairoPlatformImageCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ImageDiff/cairo/PlatformImageCairo.cpp (235928 => 235929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ImageDiff/cairo/PlatformImageCairo.cpp       2018-09-12 02:42:35 UTC (rev 235928)
+++ trunk/Tools/ImageDiff/cairo/PlatformImageCairo.cpp  2018-09-12 04:50:09 UTC (rev 235929)
</span><span class="lines">@@ -29,30 +29,15 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> 
</span><del>-#ifdef _WIN32
-#define FORMAT_SIZE_T "Iu"
-#else
-#define FORMAT_SIZE_T "zu"
-#endif
-
</del><span class="cx"> namespace ImageDiff {
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr<PlatformImage> PlatformImage::createFromStdin(size_t imageSize)
</span><span class="cx"> {
</span><del>-    struct ReadContext {
-        char buffer[2048];
-        unsigned long incomingBytes;
-        unsigned long readBytes;
-    } context { { }, imageSize, 0 };
-
</del><span class="cx">     cairo_surface_t* surface = cairo_image_surface_create_from_png_stream(
</span><del>-        [](void* closure, unsigned char* data, unsigned length) -> cairo_status_t {
-            auto& context = *static_cast<ReadContext*>(closure);
-            context.readBytes += length;
-
</del><ins>+        [](void*, unsigned char* data, unsigned length) -> cairo_status_t {
</ins><span class="cx">             size_t readBytes = fread(data, 1, length, stdin);
</span><span class="cx">             return readBytes == length ? CAIRO_STATUS_SUCCESS : CAIRO_STATUS_READ_ERROR;
</span><del>-        }, &context);
</del><ins>+        }, nullptr);
</ins><span class="cx"> 
</span><span class="cx">     if (cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
</span><span class="cx">         cairo_surface_destroy(surface);
</span><span class="lines">@@ -122,7 +107,7 @@
</span><span class="cx">             context.writtenBytes += length;
</span><span class="cx">             return CAIRO_STATUS_SUCCESS;
</span><span class="cx">         }, &context);
</span><del>-    fprintf(stdout, "Content-Length: %" FORMAT_SIZE_T "\n", context.writtenBytes);
</del><ins>+    fprintf(stdout, "Content-Length: %lu\n", context.writtenBytes);
</ins><span class="cx">     cairo_surface_write_to_png_stream(m_image,
</span><span class="cx">         [](void*, const unsigned char* data, unsigned length) -> cairo_status_t {
</span><span class="cx">             size_t writtenBytes = fwrite(data, 1, length, stdout);
</span></span></pre>
</div>
</div>

</body>
</html>