Mercurial > octave
diff libinterp/corefcn/__magick_read__.cc @ 26164:7f6a50f73625
Silence compiler warnings about format identifier for octave_idx_type (bug #55046).
* build-aux/mk-octave-config-h.sh, oct-conf-post.in.h: Rename macro to
OCTAVE_FORMAT_PRINTF. Add version for compiling with MinGW. Define
OCTAVE_IDX_TYPE_FORMAT.
* error.h: Use renamed macro.
* __eigs__.cc, convhulln.cc, qr.cc, pt-eval.cc, __magick_read__.cc,
cellfunn.cc, data.cc, errwarn.cc, graphics.cc, ls-mat-ascii.cc,
ls-oct-text.cc, oct-stream.cc: Use preprocessor macro for format identifier
for octave_idx_type.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 30 Nov 2018 20:07:20 +0100 |
| parents | b2917b7858ba |
| children | 00f796120a6d |
line wrap: on
line diff
--- a/libinterp/corefcn/__magick_read__.cc Mon Dec 03 19:32:31 2018 +0100 +++ b/libinterp/corefcn/__magick_read__.cc Fri Nov 30 20:07:20 2018 +0100 @@ -877,7 +877,8 @@ if (nRows != imvec[frameidx(frame)].rows () || nCols != imvec[frameidx(frame)].columns ()) { - error ("imread: all frames must have the same size but frame %i is different", + error ("imread: all frames must have the same size but frame " + "%" OCTAVE_IDX_TYPE_FORMAT " is different", frameidx(frame) +1); } } @@ -910,8 +911,8 @@ else if (depth <= 32) output = read_images<FloatNDArray> (imvec, frameidx, nargout, options); else - error ("imread: reading of images with %i-bit depth is not supported", - depth); + error ("imread: reading of images with %" OCTAVE_IDX_TYPE_FORMAT + "-bit depth is not supported", depth); } return output;