Mercurial > hg > octave-shane
changeset 12399:824b3e0ab12a
Finish reverting unintended commit left over by 12396-12397.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Sun, 06 Feb 2011 21:11:01 -0500 |
parents | 735e43b75e45 |
children | 5252f12537f8 |
files | src/ls-mat5.cc |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ls-mat5.cc +++ b/src/ls-mat5.cc @@ -541,10 +541,11 @@ std::string outbuf (destLen, ' '); // FIXME -- find a way to avoid casting away const here! - int err = uncompress (reinterpret_cast<Bytef *> - (const_cast<char *> (outbuf.c_str ())), + + int err = uncompress (reinterpret_cast<Bytef *> (const_cast<char *> (outbuf.c_str ())), &destLen, reinterpret_cast<Bytef *> (inbuf), element_length); + if (err != Z_OK) { std::string msg; @@ -585,7 +586,6 @@ error ("load: error uncompressing data element (%s from zlib)", msg.c_str ()); - break; } else {