# HG changeset patch
# User jwe
# Date 1197581736 0
# Node ID 3ceb12c499e9778a3527506565d6d68d9e005549
# Parent  8e5feea0545a3f27b69555752c9da2db777cb5bb
[project @ 2007-12-13 21:35:36 by jwe]

diff -r 8e5feea0545a -r 3ceb12c499e9 ChangeLog
--- a/ChangeLog	Thu Dec 13 17:48:59 2007 +0000
+++ b/ChangeLog	Thu Dec 13 21:35:36 2007 +0000
@@ -1,3 +1,8 @@
+2007-12-13  John W. Eaton  <jwe@octave.org>
+
+	* octMakefile.in (octave-bug, octave-config, mkoctfile):
+	Also depend on $(top_srcdir)/src/version.h.
+
 2007-12-10  John W. Eaton  <jwe@octave.org>
 
 	* acx_blas.m4: Use -lsunperf, not -xlic_lib=sunperf.
diff -r 8e5feea0545a -r 3ceb12c499e9 doc/ChangeLog
--- a/doc/ChangeLog	Thu Dec 13 17:48:59 2007 +0000
+++ b/doc/ChangeLog	Thu Dec 13 21:35:36 2007 +0000
@@ -1,3 +1,7 @@
+2007-12-13  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (conf.texi): Also depend on $(top_srcdir)/src/version.h.
+
 2007-12-05  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/geometryimages.m (image_as_txt): New function.
diff -r 8e5feea0545a -r 3ceb12c499e9 doc/Makefile.in
--- a/doc/Makefile.in	Thu Dec 13 17:48:59 2007 +0000
+++ b/doc/Makefile.in	Thu Dec 13 21:35:36 2007 +0000
@@ -42,7 +42,7 @@
 all: conf.texi $(SUBDIRS)
 .PHONY: all
 
-conf.texi: conf.texi.in $(TOPDIR)/Makeconf
+conf.texi: conf.texi.in $(TOPDIR)/Makeconf $(top_srcdir)/src/version.h
 	@$(do-subst-texinfo-vals)
 
 ../BUGS ../INSTALL.OCTAVE:
diff -r 8e5feea0545a -r 3ceb12c499e9 octMakefile.in
--- a/octMakefile.in	Thu Dec 13 17:48:59 2007 +0000
+++ b/octMakefile.in	Thu Dec 13 21:35:36 2007 +0000
@@ -89,15 +89,15 @@
 	$(MAKE) -C $@ all
 .PHONY: $(SUBDIRS)
 
-octave-bug: octave-bug.in Makeconf octMakefile
+octave-bug: octave-bug.in Makeconf octMakefile $(top_srcdir)/src/version.h
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
-octave-config: octave-config.in Makeconf octMakefile
+octave-config: octave-config.in Makeconf octMakefile $(top_srcdir)/src/version.h
 	@$(do-subst-default-vals)
 	chmod a+rx $@
 
-mkoctfile: mkoctfile.in Makeconf octMakefile
+mkoctfile: mkoctfile.in Makeconf octMakefile $(top_srcdir)/src/version.h
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
diff -r 8e5feea0545a -r 3ceb12c499e9 scripts/ChangeLog
--- a/scripts/ChangeLog	Thu Dec 13 17:48:59 2007 +0000
+++ b/scripts/ChangeLog	Thu Dec 13 21:35:36 2007 +0000
@@ -1,3 +1,9 @@
+2007-12-13  John W. Eaton  <jwe@octave.org>
+
+	* image/imshow.m: Turn axis visibility off.
+	Don't scale true color images.
+	* image/image.m: Set axis layer property to "top".
+
 2007-12-12  John W. Eaton  <jwe@octave.org>
 
 	* image/loadimage.m: Avoid calling eval.  Avoid calling exist.
diff -r 8e5feea0545a -r 3ceb12c499e9 scripts/image/image.m
--- a/scripts/image/image.m	Thu Dec 13 17:48:59 2007 +0000
+++ b/scripts/image/image.m	Thu Dec 13 21:35:36 2007 +0000
@@ -70,6 +70,7 @@
   unwind_protect
     axes (ax);
     h = __img__ (x, y, img, varargin {firstnonnumeric:end});
+    set (ax, "layer", "top");
   unwind_protect_cleanup
     axes (oldax);
   end_unwind_protect
diff -r 8e5feea0545a -r 3ceb12c499e9 scripts/image/imshow.m
--- a/scripts/image/imshow.m	Thu Dec 13 17:48:59 2007 +0000
+++ b/scripts/image/imshow.m	Thu Dec 13 21:35:36 2007 +0000
@@ -149,7 +149,7 @@
   endif
 
   ## Scale the image to the interval [0, 1] according to display_range.
-  if (! indexed || islogical (im))
+  if (! (true_color || indexed || islogical (im)))
     low = display_range(1);
     high = display_range(2);
     im = (im-low)/(high-low);
@@ -158,10 +158,11 @@
   endif
 
   if (true_color)
-    tmp = __img__ ([] , [], im);
+    tmp = __img__ ([], [], im);
   else
     tmp = image (round ((rows (colormap ()) - 1) * im));
   endif
+  set (gca (), "visible", "off");
 
   if (nargout > 0)
     h = tmp;