Mercurial > hg > octave-nkf

changeset 19514:68db8396c378

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make "image ()" use the default image cdata * graphics.in.h (image::properties::initialize_data): new public method to trigger the initialization of the x/ydata properties. * graphics.in.h (image::image): call initialize_data. * image.m: when called with no argument, use default image cdata
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Fri, 31 Oct 2014 20:44:21 +0100
parents a2595c4b8efe
children 346b20b2c2ff
files libinterp/corefcn/graphics.in.h scripts/image/image.m
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h
+++ b/libinterp/corefcn/graphics.in.h
@@ -4583,6 +4583,8 @@
 
     octave_value get_color_data (void) const;
 
+    void initialize_data (void) { update_cdata (); }
+
     // See the genprops.awk script for an explanation of the
     // properties declarations.
     // Programming note: Keep property list sorted if new ones are added.
@@ -4750,6 +4752,7 @@
     : base_graphics_object (), xproperties (mh, p)
   {
     xproperties.override_defaults (*this);
+    xproperties.initialize_data ();
   }
 
   ~image (void) { }
--- a/scripts/image/image.m
+++ b/scripts/image/image.m
@@ -69,7 +69,7 @@
   
   do_new = true;
   if (nargin == 0)
-    img = imread ("default.img");
+    img = get (0, "defaultimagecdata");
     x = y = [];
   elseif (chararg == 1) 
     ## Low-Level syntax