Adds support for reading Matlab Objects from matfile V5

src/inflate.c

@@ -474,6 +474,55 @@ InflateVarNameTag(mat_t *mat, matvar_t *matvar, void *buf)
     return bytesread;
 }
 
+/** @brief Inflates the variable name tag
+*
+* @ingroup mat_internal
+* @param mat Pointer to the MAT file
+* @param matvar Pointer to the MAT variable
+* @param buf Pointer to store the variables name tag
+* @return Number of bytes read from the file
+*/
+size_t
+InflateClassNameTag(mat_t *mat, matvar_t *matvar, void *buf)
+{
+    mat_uint8_t comp_buf[32];
+    size_t     bytesread = 0, err;
+
+    if ( buf == NULL )
+        return 0;
+
+    if ( !matvar->internal->z->avail_in ) {
+        matvar->internal->z->avail_in = 1;
+        matvar->internal->z->next_in = comp_buf;
+        bytesread += fread(comp_buf, 1, 1, mat->fp);
+    }
+    matvar->internal->z->avail_out = 8;
+    matvar->internal->z->next_out = buf;
+    err = inflate(matvar->internal->z, Z_NO_FLUSH);
+    if ( err != Z_OK ) {
+        Mat_Critical("InflateClassNameTag: inflate returned %d", err);
+        return bytesread;
+    }
+    while ( matvar->internal->z->avail_out && !matvar->internal->z->avail_in ) {
+        matvar->internal->z->avail_in = 1;
+        matvar->internal->z->next_in = comp_buf;
+        bytesread += fread(comp_buf, 1, 1, mat->fp);
+        err = inflate(matvar->internal->z, Z_NO_FLUSH);
+        if ( err != Z_OK ) {
+            Mat_Critical("InflateVarNameTag: inflate returned %d", err);
+            return bytesread;
+        }
+    }
+
+    if ( matvar->internal->z->avail_in ) {
+        fseek(mat->fp, -(int)matvar->internal->z->avail_in, SEEK_CUR);
+        bytesread -= matvar->internal->z->avail_in;
+        matvar->internal->z->avail_in = 0;
+    }
+
+    return bytesread;
+}
+
 /** @brief Inflates the variable name
  *
  * @ingroup mat_internal
@@ -524,6 +573,55 @@ InflateVarName(mat_t *mat, matvar_t *matvar, void *buf, int N)
 
     return bytesread;
 }
+/** @brief Inflates the class name
+*
+* @ingroup mat_internal
+* @param mat Pointer to the MAT file
+* @param matvar Pointer to the MAT variable
+* @param buf Pointer to store the variables name
+* @param N Number of characters in the name
+* @return Number of bytes read from the file
+*/
+size_t
+InflateClassName(mat_t *mat, matvar_t *matvar, void *buf, int N)
+{
+    mat_uint8_t comp_buf[32];
+    size_t     bytesread = 0, err;
+
+    if ( buf == NULL )
+        return 0;
+
+    if ( !matvar->internal->z->avail_in ) {
+        matvar->internal->z->avail_in = 1;
+        matvar->internal->z->next_in = comp_buf;
+        bytesread += fread(comp_buf, 1, 1, mat->fp);
+    }
+    matvar->internal->z->avail_out = N;
+    matvar->internal->z->next_out = buf;
+    err = inflate(matvar->internal->z, Z_NO_FLUSH);
+    if ( err != Z_OK ) {
+        Mat_Critical("InflateClassName: inflate returned %d", err);
+        return bytesread;
+    }
+    while ( matvar->internal->z->avail_out && !matvar->internal->z->avail_in ) {
+        matvar->internal->z->avail_in = 1;
+        matvar->internal->z->next_in = comp_buf;
+        bytesread += fread(comp_buf, 1, 1, mat->fp);
+        err = inflate(matvar->internal->z, Z_NO_FLUSH);
+        if ( err != Z_OK ) {
+            Mat_Critical("InflateClassName: inflate returned %d", err);
+            return bytesread;
+        }
+    }
+
+    if ( matvar->internal->z->avail_in ) {
+        fseek(mat->fp, -(int)matvar->internal->z->avail_in, SEEK_CUR);
+        bytesread -= matvar->internal->z->avail_in;
+        matvar->internal->z->avail_in = 0;
+    }
+
+    return bytesread;
+}
 
 /** @brief Inflates the data's tag
  *

src/mat.c

@@ -137,6 +137,46 @@ Mat_PrintNumber(enum matio_types type, void *data)
     }
 }
 
+/** @brief Copies a file
+ *
+ * @param src source file path
+ * @param dst destination file path
+ * @retval 0 on success
+ */
+static int
+mat_copy(const char* src, const char* dst)
+{
+    size_t len;
+    char buf[BUFSIZ] = {'\0'};
+    FILE* in;
+    FILE* out;
+
+    in = fopen(src, "rb");
+    if ( in == NULL ) {
+        Mat_Critical("Cannot open file \"%s\" for reading.", src);
+        return -1;
+    }
+
+    out = fopen(dst, "wb");
+    if ( out == NULL ) {
+        fclose(in);
+        Mat_Critical("Cannot open file \"%s\" for writing.", dst);
+        return -1;
+    }
+
+    while ( (len = fread(buf, sizeof(char), BUFSIZ, in)) > 0 ) {
+        if ( len != fwrite(buf, sizeof(char), len, out) ) {
+            fclose(in);
+            fclose(out);
+            Mat_Critical("Error writing to file \"%s\".", dst);
+            return -1;
+        }
+    }
+    fclose(in);
+    fclose(out);
+    return 0;
+}
+
 mat_complex_split_t *
 ComplexMalloc(size_t nbytes)
 {
@@ -680,6 +720,7 @@ Mat_VarCalloc(void)
             matvar->internal->datapos    = 0;
             matvar->internal->num_fields = 0;
             matvar->internal->fieldnames = NULL;
+            matvar->internal->classname  = NULL;
 #if defined(HAVE_ZLIB)
             matvar->internal->z          = NULL;
             matvar->internal->data       = NULL;
@@ -924,46 +965,26 @@ Mat_VarCreate(const char *name,enum matio_classes class_type,
     return matvar;
 }
 
-/** @brief Copies a file
+/** @brief Returns the class name of a object variable
  *
- * @param src source file path
- * @param dst destination file path
- * @retval 0 on success
+ * Returns the class name for the given object. The returned pointer is
+ * internal to the structure and should not be free'd.
+ * @ingroup MAT
+ * @param matvar Object matlab variable
+ * @returns classname
  */
-static int
-mat_copy(const char* src, const char* dst)
+char *
+Mat_VarGetObjectClassName(const matvar_t *matvar)
 {
-    size_t len;
-    char buf[BUFSIZ] = {'\0'};
-    FILE* in;
-    FILE* out;
-
-    in = fopen(src, "rb");
-    if ( in == NULL ) {
-        Mat_Critical("Cannot open file \"%s\" for reading.", src);
-        return -1;
-    }
-
-    out = fopen(dst, "wb");
-    if ( out == NULL ) {
-        fclose(in);
-        Mat_Critical("Cannot open file \"%s\" for writing.", dst);
-        return -1;
-    }
-
-    while ( (len = fread(buf, sizeof(char), BUFSIZ, in)) > 0 ) {
-        if ( len != fwrite(buf, sizeof(char), len, out) ) {
-            fclose(in);
-            fclose(out);
-            Mat_Critical("Error writing to file \"%s\".", dst);
-            return -1;
-        }
+    if ( matvar == NULL || matvar->class_type != MAT_C_OBJECT ||
+        NULL == matvar->internal ) {
+        return NULL;
+    } else {
+        return matvar->internal->classname;
     }
-    fclose(in);
-    fclose(out);
-    return 0;
 }
 
+
 /** @brief Deletes a variable from a file
  *
  * @ingroup MAT
@@ -1223,7 +1244,7 @@ Mat_VarDuplicate(const matvar_t *in, int opt)
 
     if ( !opt ) {
         out->data = in->data;
-    } else if ( (in->data != NULL) && (in->class_type == MAT_C_STRUCT) ) {
+    } else if ( (in->data != NULL) && ( ( in->class_type == MAT_C_STRUCT)  || ( in->class_type == MAT_C_OBJECT ) ) ) {
         out->data = malloc(in->nbytes);
         if ( out->data != NULL && in->data_size > 0 ) {
             int nfields = in->nbytes / in->data_size;