[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-26-gae05773

[Thomas Weber]

The following commit has been merged in the master branch:
commit 0204105c426995bc79b4e0210acb707b0b2887cc
Author: Thomas Weber <tweber at debian.org>
Date:   Mon May 24 16:05:49 2010 +0200

    Bug fix for #581998
    
    Scale image point color according to colormap.

diff --git a/debian/changelog b/debian/changelog
index 828478e..8324ea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.4-6) UNRELEASED; urgency=low
+
+  * New patch: scale_image_point_color, scale image point color (closes:
+    #581998)
+
+ -- Thomas Weber <tweber at debian.org>  Mon, 24 May 2010 16:03:02 +0200
+
 octave3.2 (3.2.4-5) unstable; urgency=low
 
   * New patch: fix-interp2; fixes wrong bicubic interpolation, triggered by
diff --git a/debian/in/series b/debian/in/series
index b969120..5c489cd 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -9,6 +9,7 @@ termios-h-check-3.0.diff
 no-argout-intersect.diff
 datenum-vector-input-any-orientation.diff
 :][V_3_2:
+scale_image_point_color
 fix-interp2
 50_octave-bug-tempfile.diff
 no_pdf_in_print.diff
diff --git a/debian/patches/scale_image_point_color b/debian/patches/scale_image_point_color
new file mode 100644
index 0000000..5b94e25
--- /dev/null
+++ b/debian/patches/scale_image_point_color
@@ -0,0 +1,27 @@
+From: Rik <octave at nomad.inbox5.com>
+Subject: Scale image point color according to colormap.
+
+Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/bc4eb29e0cb4
+Bug: http://savannah.gnu.org/bugs/?29926
+Bug-Debian: http://bugs.debian.org/581998
+
+--- a/scripts/image/imshow.m
++++ b/scripts/image/imshow.m
+@@ -64,7 +64,6 @@
+ 
+   ## Get the image.
+   if (ischar (im))
+-    ## Eventually, this should be imread.
+     [im, map] = imread (im);
+     indexed = true;
+     colormap (map);
+@@ -163,7 +162,8 @@
+   if (true_color || indexed)
+     tmp = image ([], [], im);
+   else
+-    tmp = image (round ((rows (colormap ()) - 1) * im));
++    tmp = image (im);
++    set (tmp, "cdatamapping", "scaled");
+   endif
+   set (gca (), "visible", "off");
+   axis ("image");

-- 
octave