Mercurial > hg > octave-max
changeset 9884:fed4aad2cdca
handle indexed images in opengl renderer
| author | Shai Ayal <shaiay@users.sourceforge.net> |
|---|---|
| date | Sat, 28 Nov 2009 15:46:10 -0500 |
| parents | 3ec3b8e80b67 |
| children | dd3fc8ba4796 |
| files | src/ChangeLog src/gl-render.cc |
| diffstat | 2 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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
--- a/src/gl-render.cc +++ b/src/gl-render.cc @@ -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)");