"default.img" missing in octave-2.9.13

[John W. Eaton]

On 10-Aug-2007, Henry F. Mollet wrote:

| Minor item and debating if I should even post this
| but the "default.img" according to
| ## Load Bobbie Jo Richardson (Born 3/16/94)
| needed in image.m (see code below)
| is not available in octave-2.9.13 whereas it was available in Octave-2.1.71.
| Therefore using "image" at octave prompt will not work in octave-2.9.13.
| 
| However, I'm not sure why providing a default image should be helpful when
| using image.m and if it were not better if a warning were given that the use
| of image.m requires at least one argument as per
| octave-2.9.13:15> help image
|  -- Function File:  image (IMG)

The original author of the image function did this for fun.

| I have copied the default.img to where it is needed so it will work in
| Octave-2.9.13 but am not convinced that it is helpful.

I checked in the following patch so now I think the default image file
should appear in the distribution and it should be installed properly.

| Second however: Whereas in octave-2.1.71 using sombrero at octave prompt
| produces a warning (usage: sombrero (n)), octave-2.9.13 will accept sombrero
| at the octave prompt because n=41 is assumed and then the sombrero is drawn.
| Apparently an image is provided but not used in this case.
| [/Applications/Octave.app/Contents/Resources/share/octave/2.9.13/imagelib]
| -bash-2.05b 521$ ls
| octave-sombrero.png

An image isn't needed, becase the plot is drawn from a function.

jwe


scripts/ChangeLog:

2007-08-10  John W. Eaton  <address@hidden>

        * image/Makefile.in (DISTFILES): Also include $(IMAGES) in the list.
        (install install-strip): Use $(IMAGES), not $(IMAGE_FILES_NO_DIR).
        (uninstall): Use $(IMAGES), not $(IMAGE_FILES_NO_DIR).
        (IMAGE_FILES, IMAGE_FILES_NO_DIR): Delete obsolete variables.
 

Index: scripts/image/Makefile.in
===================================================================
RCS file: /cvs/octave/scripts/image/Makefile.in,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile.in
--- scripts/image/Makefile.in   25 Jul 2007 15:49:17 -0000      1.33
+++ scripts/image/Makefile.in   10 Aug 2007 18:16:32 -0000
@@ -28,21 +28,18 @@
 
 IMAGES = default.img
 
-DISTFILES = $(addprefix $(srcdir)/, Makefile.in $(SOURCES))
+DISTFILES = $(addprefix $(srcdir)/, Makefile.in $(SOURCES) $(IMAGES))
 
 FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES))
 FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
 
-IMAGE_FILES = $(wildcard $(srcdir)/*.img)
-IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES))
-
 all: PKG_ADD
 .PHONY: all
 
 install install-strip:
        $(do-script-install)
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(imagedir)
-       for f in $(IMAGE_FILES_NO_DIR); do \
+       for f in $(IMAGES); do \
          rm -f $(DESTDIR)$(imagedir)/$$f; \
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \
        done
@@ -51,7 +48,7 @@
 
 uninstall:
        $(do-script-uninstall)
-       for f in $(IMAGE_FILES_NO_DIR); \
+       for f in $(IMAGES); \
          do rm -f $(DESTDIR)$(imagedir)/$$f; \
        done
 .PHONY: uninstall