Mercurial > octave

changeset 21197:9a5bb6996b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
write to pipe or file in gl2ps_print * gl2ps-renderer.cc (safe_fclose): New function. (gl2ps_print): Adapt code from F__osmesa_print__ to handle writing to pipe or file based on the filename. * __osmesa_print__.cc (close_fcn): Delete. (F__osmesa_print__): Use gl2ps_print to write image to pipe or file.
author John W. Eaton <jwe@octave.org>
date Thu, 04 Feb 2016 17:13:12 -0500
parents bd96c2efd4fe
children 1adcdc518d9e
files libinterp/corefcn/gl2ps-renderer.cc libinterp/corefcn/gl2ps-renderer.h libinterp/dldfcn/__osmesa_print__.cc
diffstat 3 files changed, 51 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl2ps-renderer.cc	Thu Feb 04 16:56:02 2016 -0500
+++ b/libinterp/corefcn/gl2ps-renderer.cc	Thu Feb 04 17:13:12 2016 -0500
@@ -626,6 +626,8 @@
                halign, valign, props.get_rotation ());
 }
 
+#endif
+
 static void
 safe_pclose (FILE *f)
 {
@@ -633,28 +635,66 @@
     octave_pclose (f);
 }
 
-#endif
+static void
+safe_fclose (FILE *f)
+{
+  if (f)
+    gnulib::fclose (f);
+}
+
+// If the name of the stream begins with '|', open a pipe to the command
+// named by the rest of the string.  Otherwise, write to the named file.
 
 void
-gl2ps_print (const graphics_object& fig, const std::string& cmd,
+gl2ps_print (const graphics_object& fig, const std::string& stream,
              const std::string& term)
 {
-#ifdef HAVE_GL2PS_H
+#if defined (HAVE_GL2PS_H)
 
-  FILE *fp = octave_popen (cmd.c_str (), "w");
+  // FIXME: should we have a way to create a file that begins with the
+  // character '|'?
 
-  if (! fp)
-    error ("print: failed to open pipe for gl2ps renderer");
+  bool have_cmd = stream.length () > 1 && stream[0] == '|';
+
+  FILE *fp = 0;
 
   unwind_protect frame;
 
-  frame.add_fcn (safe_pclose, fp);
+  if (have_cmd)
+    {
+      // Create process and pipe gl2ps output to it.
+
+      std::string cmd = stream.substr (1);
+
+      fp = octave_popen (cmd.c_str (), "w");
+
+      if (! fp)
+        error ("print: failed to open pipe \"%s\"", stream.c_str ());
+
+      frame.add_fcn (safe_pclose, fp);
+    }
+  else
+    {
+      // Write gl2ps output directly to file.
+
+      fp = gnulib::fopen (stream.c_str (), "w");
+
+      if (! fp)
+        error ("gl2ps_print: failed to create file \"%s\"", stream.c_str ());
+
+      frame.add_fcn (safe_fclose, fp);
+    }
 
   gl2ps_renderer rend (fp, term);
 
-  rend.draw (fig, cmd);
+  rend.draw (fig, "");
+
+  // Make sure buffered commands are finished!!!
+  glFinish ();
 
 #else
+
   err_disabled_feature ("gl2ps_print", "gl2ps");
+
 #endif
 }
--- a/libinterp/corefcn/gl2ps-renderer.h	Thu Feb 04 16:56:02 2016 -0500
+++ b/libinterp/corefcn/gl2ps-renderer.h	Thu Feb 04 17:13:12 2016 -0500
@@ -125,7 +125,7 @@
 #endif
 
 extern OCTINTERP_API void
-gl2ps_print (const graphics_object& fig, const std::string& cmd,
+gl2ps_print (const graphics_object& fig, const std::string& stream,
              const std::string& term);
 
 #endif
--- a/libinterp/dldfcn/__osmesa_print__.cc	Thu Feb 04 16:56:02 2016 -0500
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Thu Feb 04 17:13:12 2016 -0500
@@ -44,17 +44,13 @@
 #endif
 
 #if defined (HAVE_OSMESA) && defined (HAVE_OPENGL)
-static void
-close_fcn (FILE *f)
-{
-  gnulib::fclose (f);
-}
 
 static void
 reset_visibility (figure::properties *fp)
 {
   fp->set_visible ("on");
 }
+
 #endif
 
 DEFUN_DLD(__osmesa_print__, args, ,
@@ -100,10 +96,6 @@
     {
       if (! (args(1).is_string () && args(2).is_string ()))
         error ("__osmesa_print__: FILE and TERM must be strings");
-
-#ifndef HAVE_GL2PS_H
-      error ("__osmesa_print__: Octave has been compiled without gl2ps");
-#endif
     }
 
   octave_value_list retval;
@@ -159,45 +151,10 @@
 
   if (nargin == 3)
     {
-      // use gl2ps
-#ifndef HAVE_GL2PS_H
-      err_disabled_feature ("__osmesa_print__", "gl2ps");
-#else
       std::string file = args(1).string_value ();
       std::string term = args(2).string_value ();
 
-      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)
-        {
-          // 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)
-            error ("__osmesa_print__: Couldn't create file \"%s\"", file.c_str ());
-
-          unwind_protect frame;
-
-          frame.add_fcn (close_fcn, filep);
-
-          gl2ps_renderer rend (filep, term);
-          rend.draw (fobj, "");
-
-          // Make sure buffered commands are finished!!!
-          glFinish ();
-        }
-#endif
+      gl2ps_print (fobj, file, term);
     }
   else
     {