Mercurial > hg > octave-max

changeset 14173:47a5e29ecc0b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow QuantumDepth=32 installations of Magick++ (Bug #35229) __magick_read__.cc: Use uint64_t in expression because default 32-bit value overflows when QuantumDepth=32.
author Rik <octave@nomad.inbox5.com>
date Sun, 08 Jan 2012 18:59:03 -0800
parents cba1c681f1b7
children 447b57ebc27b
files src/DLD-FUNCTIONS/__magick_read__.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__magick_read__.cc
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc
@@ -212,7 +212,8 @@
   idim(3) = nframes;
 
   Magick::ImageType type = imvec[0].type ();
-  const int divisor = (((1 << QuantumDepth) - 1) / ((1 << depth) - 1));
+  const int divisor = ((uint64_t (1) << QuantumDepth) - 1) / 
+                      ((uint64_t (1) << depth) - 1);
 
   switch (type)
     {