Mercurial > octave

changeset 23695:47c39af89401

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tag deprecated gl2ps_print wrapper function with OCTAVE_DEPRECATED attribute * gl2ps-print.h (gl2ps_print): Tag deprecated wrapper function with OCTAVE_DEPRECATED attribute. * Canvas.cc, __init_fltk__.cc, __osmesa_print__.cc: Outside of octave namespace, use octave::gl2ps_print.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Jun 2017 09:02:21 -0400
parents 4a62da62af09
children 08036a7f3660
files libgui/graphics/Canvas.cc libinterp/corefcn/gl2ps-print.h libinterp/dldfcn/__init_fltk__.cc libinterp/dldfcn/__osmesa_print__.cc
diffstat 4 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc	Mon Jun 26 08:06:05 2017 -0400
+++ b/libgui/graphics/Canvas.cc	Mon Jun 26 09:02:21 2017 -0400
@@ -111,7 +111,7 @@
       {
         graphics_object figObj (obj.get_ancestor ("figure"));
 
-        gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ());
+        octave::gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ());
       }
   }
 
--- a/libinterp/corefcn/gl2ps-print.h	Mon Jun 26 08:06:05 2017 -0400
+++ b/libinterp/corefcn/gl2ps-print.h	Mon Jun 26 09:02:21 2017 -0400
@@ -38,6 +38,7 @@
 
 #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
+OCTAVE_DEPRECATED (4.2, "use 'octave::gl2ps_print' instead")
 inline void
 gl2ps_print (const graphics_object& fig, const std::string& stream,
              const std::string& term)
--- a/libinterp/dldfcn/__init_fltk__.cc	Mon Jun 26 08:06:05 2017 -0400
+++ b/libinterp/dldfcn/__init_fltk__.cc	Mon Jun 26 09:02:21 2017 -0400
@@ -149,7 +149,7 @@
   {
     //std::cout << "OpenGL_fltk::print(cmd=" << cmd << ", term=" << term << ") canvas size = " << w () << "x" << h () << std::endl;
 
-    gl2ps_print (gh_manager::get_object (m_number), cmd, term);
+    octave::gl2ps_print (gh_manager::get_object (m_number), cmd, term);
   }
 
   uint8NDArray get_pixels (void)
--- a/libinterp/dldfcn/__osmesa_print__.cc	Mon Jun 26 08:06:05 2017 -0400
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Mon Jun 26 09:02:21 2017 -0400
@@ -162,7 +162,7 @@
       std::string file = args(1).string_value ();
       std::string term = args(2).string_value ();
 
-      gl2ps_print (fobj, file, term);
+      octave::gl2ps_print (fobj, file, term);
     }
   else
     {