Mercurial > octave
diff libinterp/corefcn/gl2ps-print.cc @ 29654:d13d090cb03a stable
use std::size_t and std::ptrdiff_t in C++ code (bug #60471)
Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc,
Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc,
debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc,
fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc,
graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc,
latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc,
mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h,
pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h,
stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h,
symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc,
utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc,
audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc,
cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h,
ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h,
ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc,
ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h,
ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc,
jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll,
oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc,
pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc,
pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h,
Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc,
oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc,
mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc,
action-container.cc, action-container.h, base-list.h, caseless-str.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h,
file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h,
lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc,
oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc,
quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc,
and shared-fcns.h.
(grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 28 Apr 2021 22:57:42 -0400 |
| parents | 0a5b15007766 |
| children | 32f4357ac8d9 096523ffd20d |
line wrap: on
line diff
--- a/libinterp/corefcn/gl2ps-print.cc Wed Apr 28 22:23:39 2021 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Wed Apr 28 22:57:42 2021 -0400 @@ -399,18 +399,18 @@ std::string include_graph; - size_t found_redirect = old_print_cmd.find ('>'); + std::size_t found_redirect = old_print_cmd.find ('>'); if (found_redirect != std::string::npos) include_graph = old_print_cmd.substr (found_redirect + 1); else include_graph = old_print_cmd; - size_t n_begin = include_graph.find_first_not_of (" \"'"); + std::size_t n_begin = include_graph.find_first_not_of (" \"'"); if (n_begin != std::string::npos) { - size_t n_end = include_graph.find_last_not_of (" \"'"); + std::size_t n_end = include_graph.find_last_not_of (" \"'"); include_graph = include_graph.substr (n_begin, n_end - n_begin + 1); } @@ -460,7 +460,7 @@ // Copy temporary file to pipe std::fseek (tmpf, 0, SEEK_SET); char str[8192]; // 8 kB is a common kernel buffersize - size_t nread, nwrite; + std::size_t nread, nwrite; nread = 1; // In EPS terminal read the header line by line and insert a @@ -497,7 +497,7 @@ // Remove this "else if" block, and // make header_found true for SVG if gl2ps is fixed. std::string srchstr (str); - size_t pos = srchstr.find ("px"); + std::size_t pos = srchstr.find ("px"); if (pos != std::string::npos) { header_found = true; @@ -935,7 +935,7 @@ const uint8_t *c = reinterpret_cast<const uint8_t *> (tmpstr.c_str ()); - for (size_t i = 0; i < tmpstr.size ();) + for (std::size_t i = 0; i < tmpstr.size ();) { int mblen = octave_u8_strmblen_wrapper (c + i); @@ -979,7 +979,7 @@ ss << "(" << str << ") ["; std::vector<double> xdata = txtobj.get_xdata (); - for (size_t i = 1; i < xdata.size (); i++) + for (std::size_t i = 1; i < xdata.size (); i++) ss << xdata[i] - xdata[i-1] << " "; ss << "10] " << rotation << " " << txtobj.get_x ()