e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-02-07 09:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileRead fix for long matlab array names.

Browse Source
This commit is contained in:
Gary Scavone
2014-01-18 15:51:30 -05:00
parent e619de2a65
commit 9e6a25d046
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FileRead.cpp
View File

@@ -598,7 +598,7 @@ bool FileRead :: getMatInfo( const char *fileName )
SINT32 namesize = 4; SINT32 namesize = 4;
if ( nametype == 1 ) { // array name > 4 characters if ( nametype == 1 ) { // array name > 4 characters
if ( fread(&namesize, 4, 1, fd_) != 1 ) goto error; 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" if ( namesize != 2 ) goto tryagain; // expecting name = "fs"
namesize = 8; // field must be padded to multiple of 8 bytes namesize = 8; // field must be padded to multiple of 8 bytes
} }
@@ -684,7 +684,7 @@ bool FileRead :: getMatInfo( const char *fileName )
SINT32 namesize = 4; SINT32 namesize = 4;
if ( nametype == 1 ) { // array name > 4 characters if ( nametype == 1 ) { // array name > 4 characters
if ( fread(&namesize, 4, 1, fd_) != 1 ) goto error; 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); namesize = (SINT32) ceil((float)namesize / 8);
if ( fseek( fd_, namesize*8, SEEK_CUR) == -1 ) goto error; // jump over array name if ( fseek( fd_, namesize*8, SEEK_CUR) == -1 ) goto error; // jump over array name
} }