Mercurial > hg > octave-avbm
changeset 6704:781777998927
[project @ 2007-06-13 05:23:56 by jwe]
author | jwe |
---|---|
date | Wed, 13 Jun 2007 05:24:03 +0000 |
parents | 31c8d115f25d |
children | 0ee6bda23b87 |
files | ChangeLog configure.in scripts/ChangeLog scripts/plot/__pltopt1__.m src/ChangeLog src/DLD-FUNCTIONS/cellfun.cc |
diffstat | 6 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-12 Benjamin Lindner <lindnerben@gmx.net> + + * configure.in: For mingw, add -lws2_32 -lkernel32 to LIBS and set + _USE_MATH_DEFINES same as for msvc. + 2007-06-06 Michael Goffioul <michael.goffioul@swing.be> * configure.in: Check for utime.h and sys/utime.h headers.
--- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.564 $) +AC_REVISION($Revision: 1.565 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1290,11 +1290,11 @@ AC_CHECK_FUNCS(getpwnam, [], [AC_CHECK_LIB(sun, getpwnam)]) case "$canonical_host_type" in - *-*-cygwin* | *-*-mingw*) + *-*-cygwin*) AC_CHECK_LIB(wsock32, gethostname) LIBS="$LIBS -lwsock32" ;; - *-*-msdosmsvc*) + *-*-msdosmsvc* | *-*-mingw*) LIBS="$LIBS -lws2_32 -lkernel32" ;; esac @@ -1441,7 +1441,7 @@ OCTAVE_SMART_PUTENV case "$canonical_host_type" in - *-*-msdosmsvc) + *-*-msdosmsvc | *-*-mingw*) AC_MSG_CHECKING([for required _WIN32_WINNT]) AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ #include <windows.h>
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,7 +1,11 @@ +2007-06-12 Michael Goffioul <michael.goffioul@swing.be> + + * plot/__pltopt1__.m: Set linestyle to "none" instead of "". + Set have_linestyle to true if two character linestyle is found. + 2007-06-12 David Bateman <dbateman@free.fr> - * general/interp1.m: Change examples to use new graphics - interface. + * general/interp1.m: Change examples to use new graphics interface. * general/__splinen__.m: New support function for N-dimensional spline interpolation. * general/bicubic.m: Allow definition of extrapolation @@ -13,8 +17,7 @@ and spline interpolation. * general/interp3.m: New function for 3-dimensional, linear, nearest and spline interpolation. - * polynomial/spline.m: Change examples to use new graphics - interface. + * polynomial/spline.m: Change examples to use new graphics interface. 2007-06-12 Steve M. Robbins <steve@sumost.ca>
--- a/scripts/plot/__pltopt1__.m +++ b/scripts/plot/__pltopt1__.m @@ -48,6 +48,7 @@ while (! isempty (opt)) if (strncmp (opt, "--", 2) || strncmp (opt, "-.", 2)) options.linestyle = opt(1:2); + have_linestyle = true; n = 2; else topt = opt(1); @@ -113,7 +114,7 @@ endwhile if (have_marker && ! have_linestyle) - options.linestyle = ""; + options.linestyle = "none"; endif endfunction
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-06-12 Benjamin Lindner <lindnerben@gmx.net> + + * DLD-FUNCTIONS/cellfun.cc: Use fullfile to generate filenames + instead of assuming / will work as directory separator. + 2007-06-12 David Bateman <dbateman@free.fr> * DLD-FUNCTIONS/interpn.cc: Remove it.
--- a/src/DLD-FUNCTIONS/cellfun.cc +++ b/src/DLD-FUNCTIONS/cellfun.cc @@ -526,8 +526,8 @@ %!error(cellfun(@factorial,{-1,3})) %!assert(cellfun(@factorial,{-1,3},'ErrorHandler',@(x,y) NaN),[NaN,6]) %!test -%! [a,b,c]=cellfun(@fileparts,{'/a/b/c.d','/e/f/g.h'},'UniformOutput',false); -%! assert(a,{'/a/b','/e/f'}) +%! [a,b,c]=cellfun(@fileparts,{fullfile("a","b","c.d"),fullfile("e","f","g.h")},'UniformOutput',false); +%! assert(a,{fullfile("a","b"),fullfile("e","f")}) %! assert(b,{'c','g'}) %! assert(c,{'.d','.h'})