Mercurial > octave-libgccjit
changeset 18634:5b6901b06106 gui-release
maint: Periodic merge of stable to gui-release.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 06 Apr 2014 13:37:23 -0700 |
| parents | c7df983b003a (current diff) 5fe907167520 (diff) |
| children | 6a4b7ccc60b1 7cb98e81ecd1 |
| files | libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp liboctave/util/oct-inttypes.cc liboctave/util/oct-inttypes.h |
| diffstat | 6 files changed, 35 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Sun Apr 06 12:12:56 2014 +0200 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Sun Apr 06 13:37:23 2014 -0700 @@ -269,9 +269,9 @@ ////////////////////////////////////////////////////////////////////////////// QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd) - : q (parent), m_command (cmd), m_hasBlinkingCursor (true), - m_cursorType (BlockCursor), m_beginSelection (0, 0), - m_endSelection (0, 0), m_settingSelection (false), + : q (parent), m_command (cmd), m_cursorBlinking (false), + m_hasBlinkingCursor (true), m_cursorType (BlockCursor), + m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false), m_process (NULL), m_inWheelEvent (false) { log (NULL);
--- a/liboctave/util/oct-inttypes.cc Sun Apr 06 12:12:56 2014 +0200 +++ b/liboctave/util/oct-inttypes.cc Sun Apr 06 13:37:23 2014 -0700 @@ -799,4 +799,23 @@ %!assert ((int64 (2**62)+1)**1, int64 (2**62)+1) %!assert ((int64 (2**30)+1)**2, int64 (2**60+2**31) + 1) +%!assert (uint8 (char (128)), uint8 (128)); +%!assert (uint8 (char (255)), uint8 (255)); +%!assert (int8 (char (128)), int8 (128)); +%!assert (int8 (char (255)), int8 (255)); + +%!assert (uint16 (char (128)), uint16 (128)); +%!assert (uint16 (char (255)), uint16 (255)); +%!assert (int16 (char (128)), int16 (128)); +%!assert (int16 (char (255)), int16 (255)); + +%!assert (uint32 (char (128)), uint32 (128)); +%!assert (uint32 (char (255)), uint32 (255)); +%!assert (int32 (char (128)), int32 (128)); +%!assert (int32 (char (255)), int32 (255)); + +%!assert (uint64 (char (128)), uint64 (128)); +%!assert (uint64 (char (255)), uint64 (255)); +%!assert (int64 (char (128)), int64 (128)); +%!assert (int64 (char (255)), int64 (255)); */
--- a/liboctave/util/oct-inttypes.h Sun Apr 06 12:12:56 2014 +0200 +++ b/liboctave/util/oct-inttypes.h Sun Apr 06 13:37:23 2014 -0700 @@ -837,6 +837,11 @@ octave_int (T i) : ival (i) { } + // Always treat characters as unsigned. + octave_int (char c) + : ival (octave_int_base<T>::truncate_int (static_cast<unsigned char> (c))) + { } + octave_int (double d) : ival (octave_int_base<T>::convert_real (d)) { } octave_int (float d) : ival (octave_int_base<T>::convert_real (d)) { }
--- a/scripts/general/interp1.m Sun Apr 06 12:12:56 2014 +0200 +++ b/scripts/general/interp1.m Sun Apr 06 13:37:23 2014 -0700 @@ -247,20 +247,21 @@ case "linear" xx = x; + nxx = nx; yy = y; - nxx = nx; + dy = diff (yy); if (have_jumps) ## Omit zero-size intervals. - yy(jumps, :) = []; xx(jumps) = []; nxx = rows (xx); + yy(jumps, :) = []; + dy(jumps, :) = []; endif - dy = diff (yy); dx = diff (xx); dx = repmat (dx, [1 size(dy)(2:end)]); - coefs = [(dy./dx).'(:), yy(1:nxx-1, :).'(:)]; + coefs = [(dy./dx).', yy(1:nxx-1, :).']; pp = mkpp (xx, coefs, szy(2:end)); pp.orient = "first"; @@ -631,8 +632,8 @@ %!assert (interp1 (0:4, 2.5), 1.5) ## Left and Right discontinuities -%!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "right"), [-8,2,4,3,1.5]) -%!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "left"), [-2,0.5,1,1.5,1.5]) +%!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "right"), [-2,0.5,4,3,1.5]) +%!assert (interp1 ([1,2,2,3,4],[0,1,4,2,1],[-1,1.5,2,2.5,3.5], "linear", "extrap", "left"), [-2,0.5,1,3,1.5]) %% Test input validation %!error interp1 ()
--- a/scripts/image/image.m Sun Apr 06 12:12:56 2014 +0200 +++ b/scripts/image/image.m Sun Apr 06 13:37:23 2014 -0700 @@ -184,7 +184,7 @@ if (! isempty (img)) if (isscalar (get (hax, "children"))) - axis (hax, "image") + axis (hax, "tight"); endif if (ndims (img) == 3)
--- a/scripts/image/imagesc.m Sun Apr 06 12:12:56 2014 +0200 +++ b/scripts/image/imagesc.m Sun Apr 06 13:37:23 2014 -0700 @@ -100,8 +100,6 @@ endif if (do_new && ! ishold (hax)) - ## Turn off axis equal which is set by image() call - axis ("normal"); ## use given climits or guess them from the matrix if (numel (climits) == 2 && climits(1) <= climits(2)) set (hax, "clim", climits);