Mercurial > octave-nkf

changeset 10978:71f38cba668d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__magick_read__.cc: eliminate some casts
author John W. Eaton <jwe@octave.org>
date Wed, 15 Sep 2010 13:52:02 -0400
parents 71ad9c8f20f5
children 7f49dc864f32
files src/DLD-FUNCTIONS/__magick_read__.cc
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/__magick_read__.cc	Wed Sep 15 13:43:29 2010 -0400
+++ b/src/DLD-FUNCTIONS/__magick_read__.cc	Wed Sep 15 13:52:02 2010 -0400
@@ -535,7 +535,6 @@
               const Octave_map& options,
               bool)
 {
-  int nframes = static_cast<int>(imvec.size ());
   bool something_set = 0;
 
   // Quality setting
@@ -554,11 +553,11 @@
       something_set = 1;
       if (result.is_real_type ())
         {
-          int qlev = static_cast<int>(result.int_value ());
+          int qlev = result.int_value ();
           if (qlev < 0 || qlev > 100)
             warning ("warning: Quality setting invalid--use default of 75");
           else
-            for (int fnum = 0; fnum < nframes; fnum++)
+            for (size_t fnum = 0; fnum < imvec.size (); fnum++)
               imvec[fnum].quality (static_cast<unsigned int>(qlev));
         }
       else
@@ -729,9 +728,8 @@
 encode_map (std::vector<Magick::Image>& imvec, const NDArray& cmap)
 {
   unsigned int mapsize = cmap.dim1 ();
-  int nframes = static_cast<int>(imvec.size ());
 
-  for (int fnum = 0; fnum < nframes; fnum++)
+  for (size_t fnum = 0; fnum < imvec.size (); fnum++)
     {
       imvec[fnum].colorMapSize (mapsize);
       imvec[fnum].type (Magick::PaletteType);
@@ -811,8 +809,7 @@
 
   try
     {
-      int nframes = static_cast<int>(imvec.size ());
-      for (int i = 0; i < nframes ; i++)
+      for (int i = 0; i < imvec.size (); i++)
         imvec[i].magick (fmt);
           
       Magick::writeImages (imvec.begin (), imvec.end (), filename);