[Octave-cvsupdate] SF.net SVN: octave:[8010] trunk/octave-forge/extra/dataframe/inst/@ dataframe

[<cde...@us...>]

Revision: 8010
          http://octave.svn.sourceforge.net/octave/?rev=8010&view=rev
Author:   cdemills
Date:     2010-12-10 10:01:02 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
When using dynamic allocation, access _over{2} as a vector

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
    trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-12-10 09:24:16 UTC (rev 8009)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-12-10 10:01:02 UTC (rev 8010)
@@ -167,8 +167,9 @@
 	    if !strcmp(dummy, UTF8_BOM),
 	      frewind(fid);
 	    endif
-	    in = fread(fid); %# slurps everything
-	    in = char(in.'); %# convert doubles to char
+	    %# slurp everything and convert doubles to char, avoiding
+	    %# problems with char > 127
+	    in = char(fread(fid).'); 
 	  else
 	    in = [];
 	  endif

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m	2010-12-10 09:24:16 UTC (rev 8009)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/subsasgn.m	2010-12-10 10:01:02 UTC (rev 8010)
@@ -113,7 +113,7 @@
 	    indc = df._cnt(2); ncol = 1;
 	    df._name{2}(end) = S(1).subs;
 	    df._name{2} = genvarname(df._name{2});
-	    df._over{2} = false;
+	    df._over{2}(end) = false;
 	  endif
     	  if (length(S) > 1),
 	    if (1 == length(S(2).subs)), %# add column reference


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.