changeset 6295:0fcce0872e02

[project @ 2007-02-10 02:10:21 by jwe]
author jwe
date Sat, 10 Feb 2007 02:10:21 +0000
parents fa02b0b467b5
children 85eb75190e01
files ChangeLog scripts/ChangeLog scripts/plot/subplot.m src/ChangeLog src/ls-mat5.cc
diffstat 5 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 09 22:01:37 2007 +0000
+++ b/ChangeLog	Sat Feb 10 02:10:21 2007 +0000
@@ -1,3 +1,7 @@
+2007-02-09  John W. Eaton  <jwe@octave.org>
+
+	* mkoctfile.in: Handle .a files.
+
 2007-02-08  John W. Eaton  <jwe@octave.org>
 
 	* octMakefile.in (all): Depend on dist-info-files.
--- a/scripts/ChangeLog	Fri Feb 09 22:01:37 2007 +0000
+++ b/scripts/ChangeLog	Sat Feb 10 02:10:21 2007 +0000
@@ -1,5 +1,7 @@
 2007-02-09  John W. Eaton  <jwe@octave.org>
 
+	* plot/subplot.m: Delete spurious call to axes.
+
 	* plot/figure.m: Call drawnow for current figure before creating
 	or switching to a new figure.
 	* plot/__uiobject_init_figure__.in: Handle empty arg the same as
--- a/scripts/plot/subplot.m	Fri Feb 09 22:01:37 2007 +0000
+++ b/scripts/plot/subplot.m	Sat Feb 10 02:10:21 2007 +0000
@@ -135,7 +135,6 @@
       if (obj.outerposition == pos)
 	found = true;
 	tmp = child;
-	axes (h);
 	break;
       endif
     endif
--- a/src/ChangeLog	Fri Feb 09 22:01:37 2007 +0000
+++ b/src/ChangeLog	Sat Feb 10 02:10:21 2007 +0000
@@ -1,5 +1,8 @@
 2007-02-09  John W. Eaton  <jwe@octave.org>
 
+	* ls-mat5.cc (PAD): Adjust to change in write_mat5_tag.
+	(TAGLENGTH): Delete unused macro.
+
 	* ov-struct.cc (octave_struct::load_ascii,
 	octave_struct::load_binary, octave_struct::load_hdf5):
 	Delete obsolete attempt at backward compatibility.
--- a/src/ls-mat5.cc	Fri Feb 09 22:01:37 2007 +0000
+++ b/src/ls-mat5.cc	Sat Feb 10 02:10:21 2007 +0000
@@ -74,8 +74,7 @@
 #include <zlib.h>
 #endif
 
-#define PAD(l) (((l)<=4)?4:(((l)+7)/8)*8)
-#define TAGLENGTH(l) ((l)<=4?4:8)
+#define PAD(l) (((l) > 0 && (l) <= 4) ? 4 : (((l)+7)/8)*8)
 
 // FIXME -- the following enum values should be the same as the
 // mxClassID values in mexproto.h, but it seems they have also changed