From 9e6a25d0465b86b165043f58cab59fe8a47f9e56 Mon Sep 17 00:00:00 2001 From: Gary Scavone Date: Sat, 18 Jan 2014 15:51:30 -0500 Subject: [PATCH] FileRead fix for long matlab array names. --- src/FileRead.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileRead.cpp b/src/FileRead.cpp index a58669c..cca92e2 100644 --- a/src/FileRead.cpp +++ b/src/FileRead.cpp @@ -598,7 +598,7 @@ bool FileRead :: getMatInfo( const char *fileName ) SINT32 namesize = 4; if ( nametype == 1 ) { // array name > 4 characters if ( fread(&namesize, 4, 1, fd_) != 1 ) goto error; - if ( byteswap_ ) swap32((unsigned char *)namesize); + if ( byteswap_ ) swap32((unsigned char *)&namesize); if ( namesize != 2 ) goto tryagain; // expecting name = "fs" namesize = 8; // field must be padded to multiple of 8 bytes } @@ -684,7 +684,7 @@ bool FileRead :: getMatInfo( const char *fileName ) SINT32 namesize = 4; if ( nametype == 1 ) { // array name > 4 characters if ( fread(&namesize, 4, 1, fd_) != 1 ) goto error; - if ( byteswap_ ) swap32((unsigned char *)namesize); + if ( byteswap_ ) swap32((unsigned char *)&namesize); namesize = (SINT32) ceil((float)namesize / 8); if ( fseek( fd_, namesize*8, SEEK_CUR) == -1 ) goto error; // jump over array name }