<!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>[117472] trunk/dports/gis/gdal</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="https://trac.macports.org/changeset/117472">117472</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-02-27 23:59:48 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Commit an upstream patch on the OpenCL georeferencer kernel</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalPortfile">trunk/dports/gis/gdal/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalfilespatchgdalwarpkernel_opencl_c_2diff">trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (117471 => 117472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2014-02-28 07:36:55 UTC (rev 117471)
+++ trunk/dports/gis/gdal/Portfile 2014-02-28 07:59:48 UTC (rev 117472)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gdal
</span><span class="cx"> version 1.10.1
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> categories gis
</span><span class="cx"> license MIT BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> # Patch to ensure that the python installation respects DESTDIR
</span><span class="cx"> patchfiles patch-swig_python_GNUmakefile \
</span><span class="cx"> patch-gdalwarpkernel_opencl_c.diff \
</span><ins>+ patch-gdalwarpkernel_opencl_c_2.diff \
</ins><span class="cx"> patch-gdalwarpkernel_opencl_h.diff
</span><span class="cx">
</span><span class="cx"> # Upstream fix for "Undefined symbols: _environ"
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchgdalwarpkernel_opencl_c_2diff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff (0 => 117472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff 2014-02-28 07:59:48 UTC (rev 117472)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+--- alg/gdalwarpkernel_opencl.orig.c 2014-02-25 10:43:16.000000000 -0800
++++ alg/gdalwarpkernel_opencl.c 2014-02-25 11:32:50.000000000 -0800
+@@ -535,6 +535,32 @@
+ const char *dVecf = "float";
+ const char *kernGenFuncs =
+ // ********************* General Funcs ********************
++"void clampToDst(float fReal,\n"
++ "__global outType *dstPtr,\n"
++ "unsigned int iDstOffset,\n"
++ "__constant float *fDstNoDataReal,\n"
++ "int bandNum);\n"
++"void setPixel(__global outType *dstReal,\n"
++ "__global outType *dstImag,\n"
++ "__global float *dstDensity,\n"
++ "__global int *nDstValid,\n"
++ "__constant float *fDstNoDataReal,\n"
++ "const int bandNum,\n"
++ "vecf fDensity, vecf fReal, vecf fImag);\n"
++"int getPixel(__read_only image2d_t srcReal,\n"
++ "__read_only image2d_t srcImag,\n"
++ "__global float *fUnifiedSrcDensity,\n"
++ "__global int *nUnifiedSrcValid,\n"
++ "__constant char *useBandSrcValid,\n"
++ "__global int *nBandSrcValid,\n"
++ "const int2 iSrc,\n"
++ "int bandNum,\n"
++ "vecf *fDensity, vecf *fReal, vecf *fImag);\n"
++"int isValid(__global float *fUnifiedSrcDensity,\n"
++ "__global int *nUnifiedSrcValid,\n"
++ "float2 fSrcCoords );\n"
++"float2 getSrcCoords(__read_only image2d_t srcCoords);\n"
++
+ "#ifdef USE_CLAMP_TO_DST_FLOAT\n"
+ "void clampToDst(float fReal,\n"
+ "__global outType *dstPtr,\n"
+@@ -666,7 +692,7 @@
+ "int bHasValid = FALSE;\n"
+
+ // Clamp the src offset values if needed
+- "if(useUnifiedSrcDensity || useUnifiedSrcValid || useUseBandSrcValid){\n"
++ "if(useUnifiedSrcDensity | useUnifiedSrcValid | useUseBandSrcValid){\n"
+ "int iSrcX = iSrc.x;\n"
+ "int iSrcY = iSrc.y;\n"
+
+@@ -903,6 +929,9 @@
+ const char *kernCubic =
+ // ************************ Cubic ************************
+ "vecf cubicConvolution(float dist1, float dist2, float dist3,\n"
++ "vecf f0, vecf f1, vecf f2, vecf f3);\n"
++
++"vecf cubicConvolution(float dist1, float dist2, float dist3,\n"
+ "vecf f0, vecf f1, vecf f2, vecf f3)\n"
+ "{\n"
+ "return ( -f0 + f1 - f2 + f3) * dist3\n"
+@@ -1023,6 +1052,9 @@
+ const char *kernResampler =
+ // ************************ LanczosSinc ************************
+
++"float lanczosSinc( float fX, float fR );\n"
++"float bSpline( float x );\n"
++
+ "float lanczosSinc( float fX, float fR )\n"
+ "{\n"
+ "if ( fX > fR || fX < -fR)\n"
</ins></span></pre>
</div>
</div>
</body>
</html>