<!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>[154304] trunk/dports/graphics/ufraw</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 { white-space: pre-line; 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="https://trac.macports.org/changeset/154304">154304</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-10-26 21:41:14 +0200 (Wed, 26 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ufraw: patch dcraw.cc to fix int vs boolean issue that breaks build (#52619).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsufrawPortfile">trunk/dports/graphics/ufraw/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsufrawfilespatchdcrawccdiff">trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsufrawPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/ufraw/Portfile (154303 => 154304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ufraw/Portfile 2016-10-26 17:12:49 UTC (rev 154303)
+++ trunk/dports/graphics/ufraw/Portfile 2016-10-26 19:41:14 UTC (rev 154304)
</span><span class="lines">@@ -41,7 +41,8 @@
</span><span class="cx"> port:lensfun \
</span><span class="cx"> port:tiff
</span><span class="cx">
</span><del>-patchfiles patch-ufraw-gimp.c.diff \
</del><ins>+patchfiles patch-dcraw.cc.diff \
+ patch-ufraw-gimp.c.diff \
</ins><span class="cx"> patch-uf_gtk.cc.diff
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span></span></pre></div>
<a id="trunkdportsgraphicsufrawfilespatchdcrawccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff (0 => 154304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff (rev 0)
+++ trunk/dports/graphics/ufraw/files/patch-dcraw.cc.diff 2016-10-26 19:41:14 UTC (rev 154304)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- dcraw.cc.orig 2016-10-26 11:00:19.000000000 -0700
++++ dcraw.cc 2016-10-26 12:20:29.000000000 -0700
+@@ -2404,7 +2404,7 @@
+ #endif
+ cinfo->src->next_input_byte = jpeg_buffer;
+ cinfo->src->bytes_in_buffer = nbytes;
+- return TRUE;
++ return (boolean) TRUE;
+ }
+
+ void CLASS kodak_jpeg_load_raw()
+@@ -2420,7 +2420,7 @@
+ jpeg_create_decompress (&cinfo);
+ jpeg_stdio_src (&cinfo, ifp);
+ cinfo.src->fill_input_buffer = fill_input_buffer;
+- jpeg_read_header (&cinfo, TRUE);
++ jpeg_read_header (&cinfo, (boolean) TRUE);
+ jpeg_start_decompress (&cinfo);
+ if ((cinfo.output_width != width ) ||
+ (cinfo.output_height*2 != height ) ||
+@@ -2493,7 +2493,7 @@
+ if (tile_length < INT_MAX)
+ fseek (ifp, get4(), SEEK_SET);
+ jpeg_stdio_src (&cinfo, ifp);
+- jpeg_read_header (&cinfo, TRUE);
++ jpeg_read_header (&cinfo, (boolean) TRUE);
+ jpeg_start_decompress (&cinfo);
+ buf = (*cinfo.mem->alloc_sarray)
+ ((j_common_ptr) &cinfo, JPOOL_IMAGE, cinfo.output_width*3, 1);
</ins></span></pre>
</div>
</div>
</body>
</html>