Mercurial > octave

changeset 21768:7190a26977cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to default.
author Mike Miller <mtmiller@octave.org>
date Mon, 23 May 2016 10:46:12 -0700
parents d16d137eb485 (current diff) f00204dae6ee (diff)
children bd51eabb38ed
files libinterp/corefcn/__magick_read__.cc
diffstat 1 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__magick_read__.cc	Thu May 05 11:05:20 2016 +0200
+++ b/libinterp/corefcn/__magick_read__.cc	Mon May 23 10:46:12 2016 -0700
@@ -1115,7 +1115,7 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    const double grey = double (*img_fvec) / divisor;
+                    const double grey = xround (double (*img_fvec) / divisor);
                     Magick::Color c (grey, grey, grey);
                     pix[GM_idx] = c;
                     img_fvec++;
@@ -1145,9 +1145,9 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    double grey = double (*img_fvec) / divisor;
+                    double grey = xround (double (*img_fvec) / divisor);
                     Magick::Color c (grey, grey, grey,
-                                     MaxRGB - (double (*a_fvec) / divisor));
+                                     MaxRGB - xround (double (*a_fvec) / divisor));
                     pix[GM_idx] = c;
                     img_fvec++;
                     a_fvec++;
@@ -1180,9 +1180,9 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    Magick::Color c (double (*img_fvec)          / divisor,
-                                     double (img_fvec[G_offset]) / divisor,
-                                     double (img_fvec[B_offset]) / divisor);
+                    Magick::Color c (xround (double (*img_fvec)          / divisor),
+                                     xround (double (img_fvec[G_offset]) / divisor),
+                                     xround (double (img_fvec[B_offset]) / divisor));
                     pix[GM_idx] = c;
                     img_fvec++;
                     GM_idx += nCols;
@@ -1215,10 +1215,10 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    Magick::Color c (double (*img_fvec)          / divisor,
-                                     double (img_fvec[G_offset]) / divisor,
-                                     double (img_fvec[B_offset]) / divisor,
-                                     MaxRGB - (double (*a_fvec) / divisor));
+                    Magick::Color c (xround (double (*img_fvec)          / divisor),
+                                     xround (double (img_fvec[G_offset]) / divisor),
+                                     xround (double (img_fvec[B_offset]) / divisor),
+                                     MaxRGB - xround (double (*a_fvec) / divisor));
                     pix[GM_idx] = c;
                     img_fvec++;
                     a_fvec++;
@@ -1253,10 +1253,10 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    Magick::Color c (double (*img_fvec)          / divisor,
-                                     double (img_fvec[M_offset]) / divisor,
-                                     double (img_fvec[Y_offset]) / divisor,
-                                     double (img_fvec[K_offset]) / divisor);
+                    Magick::Color c (xround (double (*img_fvec)          / divisor),
+                                     xround (double (img_fvec[M_offset]) / divisor),
+                                     xround (double (img_fvec[Y_offset]) / divisor),
+                                     xround (double (img_fvec[K_offset]) / divisor));
                     pix[GM_idx] = c;
                     img_fvec++;
                     GM_idx += nCols;
@@ -1291,12 +1291,12 @@
               {
                 for (octave_idx_type row = 0; row < nRows; row++)
                   {
-                    Magick::Color c (double (*img_fvec)          / divisor,
-                                     double (img_fvec[M_offset]) / divisor,
-                                     double (img_fvec[Y_offset]) / divisor,
-                                     double (img_fvec[K_offset]) / divisor);
+                    Magick::Color c (xround (double (*img_fvec)          / divisor),
+                                     xround (double (img_fvec[M_offset]) / divisor),
+                                     xround (double (img_fvec[Y_offset]) / divisor),
+                                     xround (double (img_fvec[K_offset]) / divisor));
                     pix[GM_idx] = c;
-                    ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
+                    ind[GM_idx] = MaxRGB - xround (double (*a_fvec) / divisor);
                     img_fvec++;
                     a_fvec++;
                     GM_idx += nCols;