Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
4e583dea
Commit
4e583dea
authored
Jan 12, 2015
by
Uwe Schulzweida
Browse files
fixed some compiler warnings
parent
9f2dd0a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/stream_cdf.c
View file @
4e583dea
...
...
@@ -3399,12 +3399,11 @@ size_t cdfDoInputDataTransformationDP(size_t valueCount, double *data, bool have
const
bool
haveOffset
=
IS_NOT_EQUAL
(
offset
,
0
);
const
bool
haveScaleFactor
=
IS_NOT_EQUAL
(
scaleFactor
,
1
);
size_t
missValCount
=
0
;
if
(
validMin
==
VALIDMISS
)
validMin
=
DBL_MIN
;
if
(
validMax
==
VALIDMISS
)
validMax
=
DBL_MAX
;
bool
haveRangeCheck
=
(
validMax
!=
DBL_MAX
)
|
(
validMin
!=
DBL_MIN
);
if
(
IS_EQUAL
(
validMin
,
VALIDMISS
)
)
validMin
=
DBL_MIN
;
if
(
IS_EQUAL
(
validMax
,
VALIDMISS
)
)
validMax
=
DBL_MAX
;
bool
haveRangeCheck
=
(
IS_NOT_EQUAL
(
validMax
,
DBL_MAX
))
|
(
IS_NOT_EQUAL
(
validMin
,
DBL_MIN
));
assert
(
!
haveRangeCheck
||
haveMissVal
);
switch
((
int
)
haveMissVal
|
((
int
)
haveScaleFactor
<<
1
)
...
...
@@ -3498,12 +3497,10 @@ size_t cdfDoInputDataTransformationSP(size_t valueCount, float *data, bool haveM
const
bool
haveScaleFactor
=
IS_NOT_EQUAL
(
scaleFactor
,
1
);
size_t
missValCount
=
0
;
if
(
validMin
==
VALIDMISS
)
validMin
=
DBL_MIN
;
if
(
validMax
==
VALIDMISS
)
validMax
=
DBL_MAX
;
if
(
IS_EQUAL
(
validMin
,
VALIDMISS
)
)
validMin
=
DBL_MIN
;
if
(
IS_EQUAL
(
validMax
,
VALIDMISS
)
)
validMax
=
DBL_MAX
;
bool
haveRangeCheck
=
(
validMax
!=
DBL_MAX
)
|
(
validMin
!=
DBL_MIN
);
bool
haveRangeCheck
=
(
IS_NOT_EQUAL
(
validMax
,
DBL_MAX
)
)
|
(
IS_NOT_EQUAL
(
validMin
,
DBL_MIN
)
)
;
assert
(
!
haveRangeCheck
||
haveMissVal
);
switch
((
int
)
haveMissVal
|
((
int
)
haveScaleFactor
<<
1
)
...
...
@@ -4556,7 +4553,7 @@ void cdfCreateRecords(stream_t *streamptr, int tsID)
memcpy
(
destTstep
->
records
,
sourceTstep
->
records
,
(
size_t
)
nrecs
*
sizeof
(
record_t
));
destTstep
->
recIDs
=
(
int
*
)
malloc
((
size_t
)
nvrecs
*
sizeof
(
int
));
destTstep
->
recIDs
=
(
int
*
)
x
malloc
((
size_t
)
nvrecs
*
sizeof
(
int
));
memcpy
(
destTstep
->
recIDs
,
streamptr
->
tsteps
[
1
].
recIDs
,
(
size_t
)
nvrecs
*
sizeof
(
int
));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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