Mercurial > octave

changeset 22566:656f08c45b8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Fri, 30 Sep 2016 11:07:24 -0700
parents cd2a8d0c0b56 (current diff) d14c44923705 (diff)
children 17f6ed063c69
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Fri Sep 30 08:51:18 2016 -0700
+++ b/libinterp/corefcn/graphics.cc	Fri Sep 30 11:07:24 2016 -0700
@@ -864,7 +864,7 @@
   if (is_scaled)
     x = octave::math::fix (nc * (x - clim_0) / (clim_1 - clim_0));
   else if (is_real)
-    x = octave::math::round (x - 1);
+    x = octave::math::fix (x - 1);
 
   if (octave::math::isnan (x))
     {
--- a/scripts/image/imfinfo.m	Fri Sep 30 08:51:18 2016 -0700
+++ b/scripts/image/imfinfo.m	Fri Sep 30 11:07:24 2016 -0700
@@ -173,7 +173,7 @@
 %! imformats ("update", "jpg", fmt);
 %! unwind_protect
 %!   try
-%!     imread ("I sure hope this file does not exist.jpg");
+%!     imread ("I_sure_hope_this_file_does_not_exist.jpg");
 %!   catch
 %!     error_thrown = true;
 %!   end_try_catch
--- a/scripts/image/imread.m	Fri Sep 30 08:51:18 2016 -0700
+++ b/scripts/image/imread.m	Fri Sep 30 11:07:24 2016 -0700
@@ -171,7 +171,7 @@
 %! imformats ("update", "jpg", fmt);
 %! unwind_protect
 %!   try
-%!     imread ("I sure hope this file does not exist.jpg");
+%!     imread ("I_sure_hope_this_file_does_not_exist.jpg");
 %!   catch
 %!     error_thrown = true;
 %!   end_try_catch