Mercurial > octave-nkf

changeset 6269:2f357df626cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-05 21:36:54 by jwe]
author jwe
date Mon, 05 Feb 2007 21:36:54 +0000
parents 59deaa5b7e99
children c8d25f552230
files scripts/ChangeLog scripts/plot/contourc.m src/ChangeLog src/ov-complex.h
diffstat 4 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Mon Feb 05 21:25:54 2007 +0000
+++ b/scripts/ChangeLog	Mon Feb 05 21:36:54 2007 +0000
@@ -1,3 +1,7 @@
+2007-02-05  Shai Ayal  <shaiay@users.sourceforge.net>
+
+	* plot/contourc.m: Correctly compute X and Y.
+
 2007-02-05  John W. Eaton  <jwe@octave.org>
 
 	* plot/__uiobject_draw_axes__.m: Use title "" if no explicit title.
--- a/scripts/plot/contourc.m	Mon Feb 05 21:25:54 2007 +0000
+++ b/scripts/plot/contourc.m	Mon Feb 05 21:36:54 2007 +0000
@@ -52,13 +52,13 @@
   if (nargin == 1)
     vn = 10;
     z = varargin{1};
-    x = 1:size(z,1);
-    y = 1:size(z,2);
+    x = 1:size(z,2);
+    y = 1:size(z,1);
   elseif (nargin == 2)
     vn = varargin{2};
     z = varargin{1};
-    x = 1:size(z,1);
-    y = 1:size(z,2);
+    x = 1:size(z,2);
+    y = 1:size(z,1);
   elseif (nargin == 3)
     vn = 10;
     x = varargin{1};
--- a/src/ChangeLog	Mon Feb 05 21:25:54 2007 +0000
+++ b/src/ChangeLog	Mon Feb 05 21:36:54 2007 +0000
@@ -1,3 +1,12 @@
+2007-02-05  John W. Eaton  <jwe@octave.org>
+
+	* ov-complex.h (octave_complex): Use std instead of OCTAVE_STD
+	since the latter was unconditionally defined to be std anyway.
+
+2007-02-05  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* ov-complex.h: Tag octave_complex class with OCTINTERP_API.
+
 2007-01-30  John W. Eaton  <jwe@octave.org>
 
 	* Merge of changes from graphics-branch:
--- a/src/ov-complex.h	Mon Feb 05 21:25:54 2007 +0000
+++ b/src/ov-complex.h	Mon Feb 05 21:36:54 2007 +0000
@@ -1,4 +1,3 @@
-#define OCTAVE_STD std
 /*
 
 Copyright (C) 1996, 1997 John W. Eaton
@@ -49,6 +48,7 @@
 // Complex scalar values.
 
 class
+OCTAVE_API
 octave_complex : public octave_base_scalar<Complex>
 {
 public:
@@ -81,8 +81,8 @@
   octave_value any (int = 0) const
     {
       return (scalar != Complex (0, 0)
-	      && ! (lo_ieee_isnan (OCTAVE_STD::real (scalar))
-		    || lo_ieee_isnan (OCTAVE_STD::imag (scalar))));
+	      && ! (lo_ieee_isnan (std::real (scalar))
+		    || lo_ieee_isnan (std::imag (scalar))));
     }
 
   bool is_complex_scalar (void) const { return true; }