# HG changeset patch
# User Rik <rik@octave.org>
# Date 1475258844 25200
# Node ID 656f08c45b8ecd39287e5d290d9cf5bb786b0371
# Parent  cd2a8d0c0b562ce7bf374a2c3df46d6683809264# Parent  d14c44923705d1faf325754a4ee8841e87f6b7d7
maint: merge stable to default.

diff -r cd2a8d0c0b56 -r 656f08c45b8e libinterp/corefcn/graphics.cc
--- 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))
     {
diff -r cd2a8d0c0b56 -r 656f08c45b8e scripts/image/imfinfo.m
--- 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
diff -r cd2a8d0c0b56 -r 656f08c45b8e scripts/image/imread.m
--- 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