# HG changeset patch
# User Shai Ayal <shaiay@users.sourceforge.net>
# Date 1259441170 18000
# Node ID fed4aad2cdca289d9eed8a9da7747bbdd054ca52
# Parent  3ec3b8e80b67ae8d5d342c05438f1188e6d44da3
handle indexed images in opengl renderer

diff -r 3ec3b8e80b67 -r fed4aad2cdca src/ChangeLog
--- a/src/ChangeLog	Sat Nov 28 15:35:32 2009 -0500
+++ b/src/ChangeLog	Sat Nov 28 15:46:10 2009 -0500
@@ -1,3 +1,7 @@
+2009-11-28  Shai Ayal  <shaiay@users.sourceforge.net>
+
+	* gl-render.cc (opengl_renderer::draw_image): Handle indexed images.
+
 2009-11-28  Shai Ayal  <shaiay@users.sourceforge.net>
 
 	* gl-render.h (opengl_renderer::draw): Draw children from end of
diff -r 3ec3b8e80b67 -r fed4aad2cdca src/gl-render.cc
--- a/src/gl-render.cc	Sat Nov 28 15:35:32 2009 -0500
+++ b/src/gl-render.cc	Sat Nov 28 15:46:10 2009 -0500
@@ -2694,7 +2694,7 @@
 void
 opengl_renderer::draw_image (const image::properties& props)
 {
-  octave_value cdata = props.get_cdata ();
+  octave_value cdata = props.get_color_data ();
   dim_vector dv (cdata.dims ());
   int h = dv(0), w = dv(1);
   bool ok = true;
@@ -2817,13 +2817,7 @@
 	  warning ("opengl_texture::draw: invalid image data type (expected double, uint16, or uint8)");
 	}
     }
-  // indexed
-  else if (dv.length () == 2)
-    {
-      // FIXME -- deal with indexed data
-      warning ("opengl_texture::draw:image indexed images not supported yet");
-    }
-  else
+  else 
     {
       ok = false;
       warning ("opengl_texture::draw: invalid image size (expected n*m*3 or n*m)");