Mercurial > octave

diff libinterp/corefcn/__magick_read__.cc @ 27277:db687716fed6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes: generally aim to break long lines before operators, not after Files affected: Table.cc, dw-main-window.cc, file-editor-tab.cc, file-editor.cc, main-window.cc, build-env.in.cc, __ichol__.cc, __magick_read__.cc, besselj.cc, bsxfun.cc, cellfun.cc, data.cc, dlmread.cc, error.cc, fcn-info.cc, file-io.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, load-save.cc, ls-mat4.cc, ls-mat5.cc, matrix_type.cc, mex.cc, oct-stream.cc, pr-output.cc, quadcc.cc, rand.cc, sparse-xpow.cc, syscalls.cc, sysdep.cc, utils.cc, __init_fltk__.cc, __init_gnuplot__.cc, chol.cc, fftw.cc, qr.cc, cdef-class.cc, cdef-object.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-cx-diag.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-diag.cc, ov-flt-re-diag.cc, ov-str-mat.cc, ov-struct.cc, ov.cc, op-b-sbm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-scm-scm.cc, op-sm-scm.cc, op-sm-sm.cc, jit-typeinfo.cc, pt-cbinop.cc, pt-cbinop.h, pt-eval.cc, CSparse.cc, MatrixType.cc, dSparse.cc, eigs-base.cc, lo-specfun.cc, oct-fftw.cc, cmd-edit.cc, lo-regexp.cc, oct-inttypes.h, url-transfer.cc, mkoctfile.in.cc, and octave-svgconvert.cc.
author John W. Eaton <jwe@octave.org>
date Sun, 21 Jul 2019 10:21:01 -0400
parents 72e0a106d956
children 1a06fa2fe13a
line wrap: on
line diff
--- a/libinterp/corefcn/__magick_read__.cc	Fri Jul 19 14:15:04 2019 -0400
+++ b/libinterp/corefcn/__magick_read__.cc	Sun Jul 21 10:21:01 2019 -0400
@@ -93,8 +93,8 @@
           // always has a value in libpng so if we get nothing, we assume this
           // GM version does not store them and we have to go with whatever
           // GM PseudoClass says.
-          const std::string color_type =
-            const_cast<Magick::Image&> (img).attribute ("PNG:IHDR.color-type-orig");
+          const std::string color_type
+            = const_cast<Magick::Image&> (img).attribute ("PNG:IHDR.color-type-orig");
           if (! color_type.empty () && color_type != "3")
             indexed = false;
         }
@@ -331,8 +331,8 @@
       // return the colormap of the first frame.  To obtain the colormaps
       // of different frames, one needs can either use imfinfo or a for
       // loop around imread.
-      const octave_value_list maps =
-        read_maps (const_cast<Magick::Image&> (imvec[frameidx(def_elem)]));
+      const octave_value_list maps
+        = read_maps (const_cast<Magick::Image&> (imvec[frameidx(def_elem)]));
 
       retval(1) = maps(0);
 
@@ -959,8 +959,8 @@
 bitdepth_from_class ()
 {
   typedef typename T::element_type P;
-  const octave_idx_type bitdepth =
-    sizeof (P) * std::numeric_limits<unsigned char>::digits;
+  const octave_idx_type bitdepth
+    = sizeof (P) * std::numeric_limits<unsigned char>::digits;
   return bitdepth;
 }
 
@@ -1550,10 +1550,10 @@
   const octave_idx_type nFrames = imvec.size ();
 
   const octave_idx_type quality = options.getfield ("quality").int_value ();
-  const ColumnVector delaytime =
-    options.getfield ("delaytime").column_vector_value ();
-  const Array<std::string> disposalmethod =
-    options.getfield ("disposalmethod").cellstr_value ();
+  const ColumnVector delaytime
+    = options.getfield ("delaytime").column_vector_value ();
+  const Array<std::string> disposalmethod
+    = options.getfield ("disposalmethod").cellstr_value ();
   for (octave_idx_type i = 0; i < nFrames; i++)
     {
       imvec[i].quality (quality);
@@ -2014,8 +2014,7 @@
         if (is_indexed (img))
           {
             color_type = "indexed";
-            cmap =
-              read_maps (const_cast<Magick::Image&> (img))(0).matrix_value ();
+            cmap = read_maps (const_cast<Magick::Image&> (img))(0).matrix_value ();
           }
         else
           {