Mercurial > octave-nkf
changeset 7078:405cf85b435c
[project @ 2007-10-30 14:04:59 by jwe]
| author | jwe |
|---|---|
| date | Tue, 30 Oct 2007 14:05:00 +0000 |
| parents | 525cd5f47ab6 |
| children | 6d3e53a2f963 |
| files | scripts/ChangeLog scripts/plot/__go_draw_axes__.m src/ChangeLog src/data.cc src/file-io.cc |
| diffstat | 5 files changed, 46 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Mon Oct 29 19:12:28 2007 +0000 +++ b/scripts/ChangeLog Tue Oct 30 14:05:00 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-30 David Bateman <dbateman@free.fr> + + * plot/__go_draw_axes__.m (do_linestyle_command): + Use point type 0 for ".". + 2007-10-26 John W. Eaton <jwe@octave.org> * image/imshow.m: Improve compatibility.
--- a/scripts/plot/__go_draw_axes__.m Mon Oct 29 19:12:28 2007 +0000 +++ b/scripts/plot/__go_draw_axes__.m Tue Oct 30 14:05:00 2007 +0000 @@ -1056,7 +1056,7 @@ case "*" pt = "3"; case "." - pt = "7"; + pt = "0"; case "x" pt = "2"; case {"square", "s"}
--- a/src/ChangeLog Mon Oct 29 19:12:28 2007 +0000 +++ b/src/ChangeLog Tue Oct 30 14:05:00 2007 +0000 @@ -1,3 +1,12 @@ +2007-10-30 John W. Eaton <jwe@octave.org> + + * file-io.cc (fopen_mode_to_ios_mode): Handle 'W' as 'w' and 'R' + as 'r', but warn about them. + +2007-10-29 Thomas Treichl <Thomas.Treichl@gmx.net> + + * data.cc: Include sytime.h, sys/types.h, and sys/resource.h. + 2007-10-25 John W. Eaton <jwe@octave.org> * graphics.cc (figure::properties::set_currentaxes):
--- a/src/data.cc Mon Oct 29 19:12:28 2007 +0000 +++ b/src/data.cc Tue Oct 30 14:05:00 2007 +0000 @@ -25,6 +25,16 @@ #include <config.h> #endif +#include "systime.h" + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif + #include <cfloat> #include <cmath>
--- a/src/file-io.cc Mon Oct 29 19:12:28 2007 +0000 +++ b/src/file-io.cc Tue Oct 30 14:05:00 2007 +0000 @@ -144,7 +144,27 @@ std::string mode = mode_arg; - size_t pos = mode.find ('z'); + // 'W' and 'R' are accepted as 'w' and 'r', but we warn about + // them because Matlab says they perform "automatic flushing" + // but we don't know precisely what action that implies. + + size_t pos = mode.find ('W'); + + if (pos != NPOS) + { + warning ("fopen: treating mode \"W\" as equivalent to \"w\""); + mode[pos] = 'w'; + } + + pos = mode.find ('R'); + + if (pos != NPOS) + { + warning ("fopen: treating mode \"R\" as equivalent to \"r\""); + mode[pos] = 'r'; + } + + pos = mode.find ('z'); if (pos != NPOS) {