Mercurial > hg > octave-lojdl

changeset 16225:28be9be86240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better diagnostic when reading compressed fields in mat files (bug #38488) * ls-mat5.cc (read_mat5_binary_element): Give an #else to the HAVE_ZLIB conditional compilation and give an error message there.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Fri, 08 Mar 2013 13:16:09 -0500
parents 4a848eb52de2
children 40cf0a292b20
files libinterp/interp-core/ls-mat5.cc
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/interp-core/ls-mat5.cc
+++ b/libinterp/interp-core/ls-mat5.cc
@@ -514,9 +514,9 @@
   if (read_mat5_tag (is, swap, type, element_length))
     return retval;                      // EOF
 
-#ifdef HAVE_ZLIB
   if (type == miCOMPRESSED)
     {
+#ifdef HAVE_ZLIB
       // If C++ allowed us direct access to the file descriptor of an
       // ifstream in a uniform way, the code below could be vastly
       // simplified, and additional copies of the data in memory
@@ -598,6 +598,8 @@
         error ("load: error probing size of compressed data element");
 
       return retval;
+#else // HAVE_ZLIB
+      error ("load: zlib unavailable, cannot read compressed data element");
     }
 #endif