Skip to content

Commit

Permalink
refs #1925: Update ModelicaMatIO.c from ​https://github.com/tbeu/Mode…
Browse files Browse the repository at this point in the history 
…licaStandardTables

git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@9083 7ce873d0-865f-4ce7-a662-4bb36ea78beb
  • Loading branch information
@beutlich
beutlich committed Feb 26, 2016
1 parent d9ce97f commit 0bd87bd
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions Modelica/Resources/C-Sources/ModelicaMatIO.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14486,7 +14486,7 @@ Mat_VarReadNumeric5(mat_t *mat,matvar_t *matvar,void *data,size_t N)
nBytes = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(tag+1,4,1,(FILE*)mat->fp);
bytesread += fread(tag+1,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
(void)Mat_uint32Swap(tag+1);
nBytes = tag[1];
Expand Down Expand Up @@ -15052,7 +15052,7 @@ Read5(mat_t *mat, matvar_t *matvar)
#endif
} else {
(void)fseek((FILE*)mat->fp,matvar->internal->datapos,SEEK_SET);
bytesread = fread(tag,4,1,(FILE*)mat->fp);
bytesread += fread(tag,4,1,(FILE*)mat->fp);
if ( byteswap )
(void)Mat_uint32Swap(tag);
packed_type = TYPE_FROM_TAG(tag[0]);
Expand All @@ -15061,7 +15061,7 @@ Read5(mat_t *mat, matvar_t *matvar)
nBytes = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(tag+1,4,1,(FILE*)mat->fp);
bytesread += fread(tag+1,4,1,(FILE*)mat->fp);
if ( byteswap )
(void)Mat_uint32Swap(tag+1);
nBytes = tag[1];
Expand Down Expand Up @@ -15172,7 +15172,7 @@ Read5(mat_t *mat, matvar_t *matvar)
}
#endif
} else {
bytesread = fread(tag,4,1,(FILE*)mat->fp);
bytesread += fread(tag,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
(void)Mat_uint32Swap(tag);
packed_type = TYPE_FROM_TAG(tag[0]);
Expand All @@ -15181,7 +15181,7 @@ Read5(mat_t *mat, matvar_t *matvar)
N = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(&N,4,1,(FILE*)mat->fp);
bytesread += fread(&N,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
Mat_int32Swap(&N);
}
Expand Down Expand Up @@ -15235,7 +15235,7 @@ Read5(mat_t *mat, matvar_t *matvar)
}
#endif
} else {
bytesread = fread(tag,4,1,(FILE*)mat->fp);
bytesread += fread(tag,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
Mat_uint32Swap(tag);
packed_type = TYPE_FROM_TAG(tag[0]);
Expand All @@ -15244,7 +15244,7 @@ Read5(mat_t *mat, matvar_t *matvar)
N = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(&N,4,1,(FILE*)mat->fp);
bytesread += fread(&N,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
Mat_int32Swap(&N);
}
Expand Down Expand Up @@ -15298,7 +15298,7 @@ Read5(mat_t *mat, matvar_t *matvar)
}
#endif
} else {
bytesread = fread(tag,4,1,(FILE*)mat->fp);
bytesread += fread(tag,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
Mat_uint32Swap(tag);
packed_type = TYPE_FROM_TAG(tag[0]);
Expand All @@ -15307,7 +15307,7 @@ Read5(mat_t *mat, matvar_t *matvar)
N = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(&N,4,1,(FILE*)mat->fp);
bytesread += fread(&N,4,1,(FILE*)mat->fp);
if ( mat->byteswap )
Mat_int32Swap(&N);
}
Expand Down Expand Up @@ -15411,7 +15411,7 @@ Read5(mat_t *mat, matvar_t *matvar)
(void)fseek((FILE*)mat->fp,8-(nBytes % 8),SEEK_CUR);

/* Complex Data Tag */
bytesread = fread(tag,4,1,(FILE*)mat->fp);
bytesread += fread(tag,4,1,(FILE*)mat->fp);
if ( byteswap )
(void)Mat_uint32Swap(tag);
packed_type = TYPE_FROM_TAG(tag[0]);
Expand All @@ -15420,7 +15420,7 @@ Read5(mat_t *mat, matvar_t *matvar)
nBytes = (tag[0] & 0xffff0000) >> 16;
} else {
data_in_tag = 0;
bytesread = fread(tag+1,4,1,(FILE*)mat->fp);
bytesread += fread(tag+1,4,1,(FILE*)mat->fp);
if ( byteswap )
(void)Mat_uint32Swap(tag+1);
nBytes = tag[1];
Expand Down Expand Up @@ -16179,7 +16179,7 @@ ReadData5(mat_t *mat,matvar_t *matvar,void *data,

(void)fseek((FILE*)mat->fp,matvar->internal->datapos,SEEK_SET);
if ( matvar->compression == MAT_COMPRESSION_NONE ) {
bytesread = fread(tag,4,2,(FILE*)mat->fp);
bytesread += fread(tag,4,2,(FILE*)mat->fp);
if ( mat->byteswap ) {
Mat_int32Swap(tag);
Mat_int32Swap(tag+1);
Expand Down Expand Up @@ -16253,7 +16253,7 @@ ReadData5(mat_t *mat,matvar_t *matvar,void *data,
ReadDataSlab2(mat,complex_data->Re,matvar->class_type,
matvar->data_type,matvar->dims,start,stride,edge);
(void)fseek((FILE*)mat->fp,matvar->internal->datapos+real_bytes,SEEK_SET);
bytesread = fread(tag,4,2,(FILE*)mat->fp);
bytesread += fread(tag,4,2,(FILE*)mat->fp);
if ( mat->byteswap ) {
Mat_int32Swap(tag);
Mat_int32Swap(tag+1);
Expand Down Expand Up @@ -16316,7 +16316,7 @@ ReadData5(mat_t *mat,matvar_t *matvar,void *data,
start,stride,edge);

(void)fseek((FILE*)mat->fp,matvar->internal->datapos+real_bytes,SEEK_SET);
bytesread = fread(tag,4,2,(FILE*)mat->fp);
bytesread += fread(tag,4,2,(FILE*)mat->fp);
if ( mat->byteswap ) {
Mat_int32Swap(tag);
Mat_int32Swap(tag+1);
Expand Down Expand Up @@ -16454,7 +16454,7 @@ Mat_VarReadDataLinear5(mat_t *mat,matvar_t *matvar,void *data,int start,
return -1;
(void)fseek((FILE*)mat->fp,matvar->internal->datapos,SEEK_SET);
if ( matvar->compression == MAT_COMPRESSION_NONE ) {
bytesread = fread(tag,4,2,(FILE*)mat->fp);
bytesread += fread(tag,4,2,(FILE*)mat->fp);
if ( mat->byteswap ) {
Mat_int32Swap(tag);
Mat_int32Swap(tag+1);
Expand Down Expand Up @@ -16526,7 +16526,7 @@ Mat_VarReadDataLinear5(mat_t *mat,matvar_t *matvar,void *data,int start,
ReadDataSlab1(mat,complex_data->Re,matvar->class_type,
matvar->data_type,start,stride,edge);
(void)fseek((FILE*)mat->fp,matvar->internal->datapos+real_bytes,SEEK_SET);
bytesread = fread(tag,4,2,(FILE*)mat->fp);
bytesread += fread(tag,4,2,(FILE*)mat->fp);
if ( mat->byteswap ) {
Mat_int32Swap(tag);
Mat_int32Swap(tag+1);
Expand Down

0 comments on commit 0bd87bd

Please sign in to comment.