<!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>[147005] trunk/dports/graphics/poppler/files/patch-poppler-Decrypt.cc.diff</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/147005">147005</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-03-23 00:32:41 -0700 (Wed, 23 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>poppler: fix a few more 64-bit integer constants (#50935).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicspopplerfilespatchpopplerDecryptccdiff">trunk/dports/graphics/poppler/files/patch-poppler-Decrypt.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicspopplerfilespatchpopplerDecryptccdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/poppler/files/patch-poppler-Decrypt.cc.diff (147004 => 147005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/poppler/files/patch-poppler-Decrypt.cc.diff 2016-03-23 07:23:18 UTC (rev 147004)
+++ trunk/dports/graphics/poppler/files/patch-poppler-Decrypt.cc.diff 2016-03-23 07:32:41 UTC (rev 147005)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- poppler/Decrypt.cc.orig 2016-03-20 08:07:57.000000000 -0700
-+++ poppler/Decrypt.cc 2016-03-20 08:10:40.000000000 -0700
</del><ins>+--- poppler/Decrypt.cc.orig 2016-03-23 00:18:38.000000000 -0700
++++ poppler/Decrypt.cc 2016-03-23 00:22:45.000000000 -0700
</ins><span class="cx"> @@ -1444,22 +1444,22 @@
</span><span class="cx"> //------------------------------------------------------------------------
</span><span class="cx"> // SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words.
</span><span class="lines">@@ -62,3 +62,26 @@
</span><span class="cx">
</span><span class="cx"> for (i = 0; i + 128 <= msgLen; i += 128) {
</span><span class="cx"> sha512HashBlock(msg + i, H);
</span><ins>+@@ -1620,14 +1620,14 @@
+ uint64_t H[8];
+ int blkLen, i;
+ //setting initial hash values
+- H[0] = 0xcbbb9d5dc1059ed8;
+- H[1] = 0x629a292a367cd507;
+- H[2] = 0x9159015a3070dd17;
+- H[3] = 0x152fecd8f70e5939;
+- H[4] = 0x67332667ffc00b31;
+- H[5] = 0x8eb44a8768581511;
+- H[6] = 0xdb0c2e0d64f98fa7;
+- H[7] = 0x47b5481dbefa4fa4;
++ H[0] = 0xcbbb9d5dc1059ed8ULL;
++ H[1] = 0x629a292a367cd507ULL;
++ H[2] = 0x9159015a3070dd17ULL;
++ H[3] = 0x152fecd8f70e5939ULL;
++ H[4] = 0x67332667ffc00b31ULL;
++ H[5] = 0x8eb44a8768581511ULL;
++ H[6] = 0xdb0c2e0d64f98fa7ULL;
++ H[7] = 0x47b5481dbefa4fa4ULL;
+ //SHA 384 will use the same sha512HashBlock function.
+ blkLen = 0;
+ for (i = 0; i + 128 <= msgLen; i += 128) {
</ins></span></pre>
</div>
</div>
</body>
</html>