Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
2f2eacf0
Commit
2f2eacf0
authored
Aug 07, 2014
by
Thomas Jahns
🤸
Browse files
Fix type conversions and clarify program flow.
parent
78d2561f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ieglib.c
View file @
2f2eacf0
...
...
@@ -148,10 +148,10 @@ int iegCheckFiletype(int fileID, int *swap)
size_t
sblocklen
=
0
;
size_t
data
=
0
;
size_t
dimx
=
0
,
dimy
=
0
;
in
t
fact
=
0
,
found
=
0
;
size_
t
fact
=
0
;
unsigned
char
buffer
[
1048
],
*
pbuf
;
if
(
fileRead
(
fileID
,
buffer
,
4
)
!=
4
)
return
(
found
);
if
(
fileRead
(
fileID
,
buffer
,
4
)
!=
4
)
return
(
0
);
blocklen
=
get_UINT32
(
buffer
);
sblocklen
=
get_SUINT32
(
buffer
);
...
...
@@ -163,7 +163,7 @@ int iegCheckFiletype(int fileID, int *swap)
{
*
swap
=
0
;
fact
=
4
;
if
(
fileRead
(
fileID
,
buffer
,
blocklen
+
8
)
!=
blocklen
+
8
)
return
(
found
);
if
(
fileRead
(
fileID
,
buffer
,
blocklen
+
8
)
!=
blocklen
+
8
)
return
(
0
);
pbuf
=
buffer
+
(
37
+
4
)
*
4
;
dimx
=
(
size_t
)
get_UINT32
(
pbuf
);
pbuf
=
buffer
+
(
37
+
5
)
*
4
;
dimy
=
(
size_t
)
get_UINT32
(
pbuf
);
pbuf
=
buffer
+
blocklen
+
4
;
data
=
(
size_t
)
get_UINT32
(
pbuf
);
...
...
@@ -172,7 +172,7 @@ int iegCheckFiletype(int fileID, int *swap)
{
*
swap
=
0
;
fact
=
8
;
if
(
fileRead
(
fileID
,
buffer
,
blocklen
+
8
)
!=
blocklen
+
8
)
return
(
found
);
if
(
fileRead
(
fileID
,
buffer
,
blocklen
+
8
)
!=
blocklen
+
8
)
return
(
0
);
pbuf
=
buffer
+
(
37
+
4
)
*
4
;
dimx
=
(
size_t
)
get_UINT32
(
pbuf
);
pbuf
=
buffer
+
(
37
+
5
)
*
4
;
dimy
=
(
size_t
)
get_UINT32
(
pbuf
);
pbuf
=
buffer
+
blocklen
+
4
;
data
=
(
size_t
)
get_UINT32
(
pbuf
);
...
...
@@ -181,7 +181,7 @@ int iegCheckFiletype(int fileID, int *swap)
{
*
swap
=
1
;
fact
=
4
;
if
(
fileRead
(
fileID
,
buffer
,
sblocklen
+
8
)
!=
sblocklen
+
8
)
return
(
found
);
if
(
fileRead
(
fileID
,
buffer
,
sblocklen
+
8
)
!=
sblocklen
+
8
)
return
(
0
);
pbuf
=
buffer
+
(
37
+
4
)
*
4
;
dimx
=
(
size_t
)
get_SUINT32
(
pbuf
);
pbuf
=
buffer
+
(
37
+
5
)
*
4
;
dimy
=
(
size_t
)
get_SUINT32
(
pbuf
);
pbuf
=
buffer
+
sblocklen
+
4
;
data
=
(
size_t
)
get_SUINT32
(
pbuf
);
...
...
@@ -190,7 +190,7 @@ int iegCheckFiletype(int fileID, int *swap)
{
*
swap
=
1
;
fact
=
8
;
if
(
fileRead
(
fileID
,
buffer
,
sblocklen
+
8
)
!=
sblocklen
+
8
)
return
(
found
);
if
(
fileRead
(
fileID
,
buffer
,
sblocklen
+
8
)
!=
sblocklen
+
8
)
return
(
0
);
pbuf
=
buffer
+
(
37
+
4
)
*
4
;
dimx
=
(
size_t
)
get_SUINT32
(
pbuf
);
pbuf
=
buffer
+
(
37
+
5
)
*
4
;
dimy
=
(
size_t
)
get_SUINT32
(
pbuf
);
pbuf
=
buffer
+
sblocklen
+
4
;
data
=
(
size_t
)
get_SUINT32
(
pbuf
);
...
...
@@ -198,8 +198,7 @@ int iegCheckFiletype(int fileID, int *swap)
fileRewind
(
fileID
);
if
(
data
&&
dimx
*
dimy
*
fact
==
data
)
found
=
1
;
else
if
(
data
&&
dimx
*
dimy
*
8
==
data
)
found
=
1
;
int
found
=
data
&&
(
dimx
*
dimy
*
fact
==
data
||
dimx
*
dimy
*
8
==
data
);
if
(
IEG_Debug
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment