Mercurial > octave
changeset 26533:8c3e727c44b5
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 13 Jan 2019 16:01:47 +0100 |
parents | cd73f8e9235f (current diff) 4dae224112a1 (diff) |
children | 0ba9ecd3814b |
files | libinterp/corefcn/graphics.cc libinterp/octave-value/ov-java.cc |
diffstat | 6 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc Sat Jan 12 09:15:22 2019 -0500 +++ b/libgui/src/settings-dialog.cc Sun Jan 13 16:01:47 2019 +0100 @@ -308,7 +308,7 @@ for (int i = 0; i < ed_comment_strings_count; i++) { m_rb_comment_strings[i] = new QRadioButton (); - m_rb_uncomment_strings[i] = new QRadioButton (); + m_rb_uncomment_strings[i] = new QCheckBox (); connect (m_rb_comment_strings[i], SIGNAL (clicked (bool)), m_rb_uncomment_strings[i], SLOT (setChecked (bool)));
--- a/libgui/src/settings-dialog.h Sat Jan 12 09:15:22 2019 -0500 +++ b/libgui/src/settings-dialog.h Sun Jan 13 16:01:47 2019 +0100 @@ -92,7 +92,7 @@ color_picker *m_editor_current_line_color; QRadioButton *m_rb_comment_strings[ed_comment_strings_count]; - QRadioButton *m_rb_uncomment_strings[ed_comment_strings_count]; + QCheckBox *m_rb_uncomment_strings[ed_comment_strings_count]; QCheckBox *m_ws_enable_colors; QCheckBox *m_ws_hide_tool_tips;
--- a/libinterp/corefcn/graphics.cc Sat Jan 12 09:15:22 2019 -0500 +++ b/libinterp/corefcn/graphics.cc Sun Jan 13 16:01:47 2019 +0100 @@ -7376,7 +7376,7 @@ double outer_top = inner_top + top_margin; double outer_width = outer_right - outer_left; - double outer_height = outer_top = outer_bottom; + double outer_height = outer_top - outer_bottom; Matrix outerbox (1, 4);
--- a/libinterp/octave-value/ov-java.cc Sat Jan 12 09:15:22 2019 -0500 +++ b/libinterp/octave-value/ov-java.cc Sun Jan 13 16:01:47 2019 +0100 @@ -629,7 +629,9 @@ JNIEnv *current_env; const char *static_locale = setlocale (LC_ALL, nullptr); - const std::string locale (static_locale); + std::string locale; + if (static_locale) + locale = std::string (static_locale); octave::dynamic_library lib (""); std::string jvm_lib_path = "linked in or loaded libraries";
--- a/liboctave/system/lo-sysdep.cc Sat Jan 12 09:15:22 2019 -0500 +++ b/liboctave/system/lo-sysdep.cc Sun Jan 13 16:01:47 2019 +0100 @@ -40,6 +40,7 @@ # include <wchar.h> # include "lo-hash.h" +# include "unwind-prot.h" #endif namespace octave @@ -178,7 +179,8 @@ #if defined (OCTAVE_USE_WINDOWS_API) wchar_t *wnew_item = u8_to_wchar (new_item); - std::free (static_cast<void *> (new_item)); + octave::unwind_protect frame; + frame.add_fcn (std::free, static_cast<void *> (new_item)); if (_wputenv (wnew_item) < 0) (*current_liboctave_error_handler) ("putenv (%s) failed", new_item); #else
--- a/liboctave/util/oct-rl-hist.c Sat Jan 12 09:15:22 2019 -0500 +++ b/liboctave/util/oct-rl-hist.c Sun Jan 13 16:01:47 2019 +0100 @@ -276,7 +276,7 @@ beg = (limit < 0 || end < limit) ? 0 : (end - limit); - retval = malloc ((size_t) (end - beg + 1) * sizeof (char **)); + retval = malloc ((size_t) (end - beg + 1) * sizeof (char *)); // FIXME: Should this call current_liboctave_error_handler instead? if (! retval) return retval;