Mercurial > octave-nkf

changeset 5003:a0e7231a58eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-09-16 16:44:44 by jwe]
author jwe
date Thu, 16 Sep 2004 16:46:32 +0000
parents d894b803ccb5
children efa1ba94dab5
files scripts/ChangeLog scripts/general/bitget.m src/oct-map.cc
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Sep 16 01:11:39 2004 +0000
+++ b/scripts/ChangeLog	Thu Sep 16 16:46:32 2004 +0000
@@ -1,3 +1,7 @@
+2004-09-15  David Bateman  <dbateman@free.fr>
+
+	* general/bitget.m: Replace Bmax, which is undefined with bitmax
+
 2004-09-15  John W. Eaton  <jwe@octave.org>
 
 	* strings/strcmp.m: Fix typo in cell/string array case.
--- a/scripts/general/bitget.m	Thu Sep 16 01:11:39 2004 +0000
+++ b/scripts/general/bitget.m	Thu Sep 16 16:46:32 2004 +0000
@@ -35,7 +35,7 @@
   endif
 
   if (isa (A, "double"))
-    Amax = log2 (Bmax) + 1;
+    Amax = log2 (bitmax) + 1;
     _conv = @double;
   else
     if (isa (A, "uint8"))
--- a/src/oct-map.cc	Thu Sep 16 01:11:39 2004 +0000
+++ b/src/oct-map.cc	Thu Sep 16 16:46:32 2004 +0000
@@ -124,7 +124,7 @@
 	{
 	  Octave_map::const_iterator pb = rb.seek (ra.key(pa));
 
-	  if (pa == rb.end ())
+	  if (pb == rb.end ())
 	    {
 	      error ("field name mismatch in structure concatenation");
 	      break;