octave-nkf: src/ov-struct.cc comparison

save dims for empty structs (binary fmt)

author	Jaroslav Hajek <highegg@gmail.com>
date	Tue, 24 Nov 2009 07:35:47 +0100
parents	1fac51c5f83f
children	b3089dba88bf

comparison

equal deleted inserted replaced

-:870a69bac55c
+:43a7adf62534
 {
 Octave_map m = map_value ();
 octave_idx_type nf = m.nfields ();
+dim_vector d = dims ();
+if (d.length () < 1)
+return false;
+// Use negative value for ndims
+int32_t di = - d.length();
+os.write (reinterpret_cast<char *> (&di), 4);
+for (int i = 0; i < d.length (); i++)
+{
+di = d(i);
+os.write (reinterpret_cast<char *> (&di), 4);
+}
 int32_t len = nf;
 os.write (reinterpret_cast<char *> (&len), 4);
 // Iterating over the list of keys will preserve the order of the
 // fields.
 if (! is.read (reinterpret_cast<char *> (&len), 4))
 return false;
 if (swap)
 swap_bytes<4> (&len);
+dim_vector dv (1, 1);
+if (len < 0)
+{
+// We have explicit dimensions.
+int mdims = -len;
+int32_t di;
+dv.resize (mdims);
+for (int i = 0; i < mdims; i++)
+{
+if (! is.read (reinterpret_cast<char *> (&di), 4))
+return false;
+if (swap)
+swap_bytes<4> (&di);
+dv(i) = di;
+}
+if (! is.read (reinterpret_cast<char *> (&len), 4))
+return false;
+if (swap)
+swap_bytes<4> (&len);
+}
 if (len > 0)
 {
-Octave_map m (map);
+Octave_map m (dv);
 for (octave_idx_type j = 0; j < len; j++)
 	{
 	  octave_value t2;
 	  bool dummy;
 	{
 	  error ("load: failed to load structure");
 	  success = false;
 	}
 }
-else if (len == 0 )
+else if (len == 0)
-map = Octave_map (dim_vector (1, 1));
+map = Octave_map (dv);
 else
-panic_impossible ();
+success = false;
 return success;
 }
 #if defined (HAVE_HDF5)

Mercurial > hg > octave-nkf