Mercurial > hg > octave-jordi
diff libinterp/dldfcn/__osmesa_print__.cc @ 20554:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | bb59bdbdb8ac |
| children | c2d9556d51d0 |
line wrap: on
line diff
--- a/libinterp/dldfcn/__osmesa_print__.cc +++ b/libinterp/dldfcn/__osmesa_print__.cc @@ -182,41 +182,38 @@ std::string file = args(1).string_value (); std::string term = args(2).string_value (); - if (! error_state) - { - size_t pos_p = file.find_first_of ("|"); - size_t pos_c = file.find_first_not_of ("| "); + size_t pos_p = file.find_first_of ("|"); + size_t pos_c = file.find_first_not_of ("| "); - if (pos_p == std::string::npos && pos_c == std::string::npos) - error ("__osmesa_print__: empty output ''"); - else if (pos_c == std::string::npos) - error ("__osmesa_print__: empty pipe '|'"); - else if (pos_p != std::string::npos && pos_p < pos_c) + if (pos_p == std::string::npos && pos_c == std::string::npos) + error ("__osmesa_print__: empty output ''"); + else if (pos_c == std::string::npos) + error ("__osmesa_print__: empty pipe '|'"); + else if (pos_p != std::string::npos && pos_p < pos_c) + { + // create process and pipe gl2ps output to it + std::string cmd = file.substr (pos_c); + gl2ps_print (fobj, cmd, term); + } + else + { + // write gl2ps output directly to file + FILE *filep = gnulib::fopen (file.substr (pos_c).c_str (), "w"); + + if (filep) { - // create process and pipe gl2ps output to it - std::string cmd = file.substr (pos_c); - gl2ps_print (fobj, cmd, term); + unwind_protect frame; + + frame.add_fcn (close_fcn, filep); + + glps_renderer rend (filep, term); + rend.draw (fobj, ""); + + // Make sure buffered commands are finished!!! + glFinish (); } else - { - // write gl2ps output directly to file - FILE *filep = gnulib::fopen (file.substr (pos_c).c_str (), "w"); - - if (filep) - { - unwind_protect frame; - - frame.add_fcn (close_fcn, filep); - - glps_renderer rend (filep, term); - rend.draw (fobj, ""); - - // Make sure buffered commands are finished!!! - glFinish (); - } - else - error ("__osmesa_print__: Couldn't create file \"%s\"", file.c_str ()); - } + error ("__osmesa_print__: Couldn't create file \"%s\"", file.c_str ()); } #endif }