Mercurial > octave
diff libinterp/corefcn/gl-render.cc @ 31105:670a0d878af1
eliminate WHO arguments from interpreter-private functions
* interpreter-private.h, inpterpreter-private.cc (__get_interpreter__,
__get_dynamic_loader__, __get_error_system__, __get_gh_manager__,
__get_help_system__, __get_input_system__, __get_load_path__,
__get_load_save_system__, __get_event_manager__,
__get_output_system__, __get_type_info__, __get_symbol_table__,
__get_current_scope__, __require_current_scope__, __get_evaluator__,
__get_bp_table__, __get_child_list__, __get_cdef_manager__,
__get_display_info__, __get_gtk_manager__): Eliminate WHO argument.
Previously, it was never displayed by __get_interpreter__. And, as
pointed out by Petter Tomner in patch #10216, passing a std::string
object could have performance issues.
(__get_interpreter__): Eliminate useless call to error. Display
message to std::cerr then abort.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 22 Jun 2022 12:48:59 -0400 |
| parents | 796f54d4ddbf |
| children | e88a07dec498 |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc Tue Jun 21 15:44:03 2022 +0200 +++ b/libinterp/corefcn/gl-render.cc Wed Jun 22 12:48:59 2022 -0400 @@ -1551,8 +1551,7 @@ { #if defined (HAVE_OPENGL) - gh_manager& gh_mgr - = __get_gh_manager__ ("opengl_renderer::draw_axes_x_grid"); + gh_manager& gh_mgr = __get_gh_manager__ (); int xstate = props.get_xstate (); @@ -1748,8 +1747,7 @@ { #if defined (HAVE_OPENGL) - gh_manager& gh_mgr - = __get_gh_manager__ ("opengl_renderer::draw_axes_y_grid"); + gh_manager& gh_mgr = __get_gh_manager__ (); int ystate = props.get_ystate (); @@ -1944,8 +1942,7 @@ void opengl_renderer::draw_axes_z_grid (const axes::properties& props) { - gh_manager& gh_mgr - = __get_gh_manager__ ("opengl_renderer::draw_axes_z_grid"); + gh_manager& gh_mgr = __get_gh_manager__ (); int zstate = props.get_zstate (); @@ -2167,8 +2164,7 @@ std::list<graphics_object>& obj_list) { #if defined (HAVE_OPENGL) - gh_manager& gh_mgr - = __get_gh_manager__ ("opengl_renderer::draw_axes_all_lights"); + gh_manager& gh_mgr = __get_gh_manager__ (); Matrix children = props.get_all_children (); @@ -3771,8 +3767,7 @@ if (props.markerfacecolor_is ("auto")) { - gh_manager& gh_mgr - = __get_gh_manager__ ("opengl_renderer::draw_scatter"); + gh_manager& gh_mgr = __get_gh_manager__ (); graphics_object go = gh_mgr.get_object (props.get___myhandle__ ()); graphics_object ax = go.get_ancestor ("axes"); const axes::properties& ax_props @@ -4163,7 +4158,7 @@ { int len = hlist.numel (); - gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::draw"); + gh_manager& gh_mgr = __get_gh_manager__ (); for (int i = len-1; i >= 0; i--) { @@ -4664,7 +4659,7 @@ double opengl_renderer::points_to_pixels (const double val) const { - gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::points_to_pixels"); + gh_manager& gh_mgr = __get_gh_manager__ (); // FIXME: Does making this static cause problems if figure is moved to a // 2nd monitor with a different value for "screenpixelsperinch"?