Commit 2022c119 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cgribexlib update

parent 1821e4fc
/* Automatically generated by m214003 at 2010-01-08, do not edit */ /* Automatically generated by m214003 at 2010-01-12, do not edit */
/* CGRIBEXLIB_VERSION="1.4.2" */ /* CGRIBEXLIB_VERSION="1.4.2" */
...@@ -4648,7 +4648,7 @@ int decodeBDS(int decscale, unsigned char *bds, int *isec2, int *isec4, ...@@ -4648,7 +4648,7 @@ int decodeBDS(int decscale, unsigned char *bds, int *isec2, int *isec4,
bds_rep = bds_flag >> 7; bds_rep = bds_flag >> 7;
if ( bds_rep == 0 ) isec4[2] = 0; if ( bds_rep == 0 ) isec4[2] = 0;
else isec4[2] = 128; else isec4[2] = 128;
/* -0------ simple packing */ /* -0------ simple packing */
/* -1------ complex packing */ /* -1------ complex packing */
...@@ -4781,7 +4781,12 @@ int decodeBDS(int decscale, unsigned char *bds, int *isec2, int *isec4, ...@@ -4781,7 +4781,12 @@ int decodeBDS(int decscale, unsigned char *bds, int *isec2, int *isec4,
jlend = ISEC2_NumLon*ISEC2_NumLat; jlend = ISEC2_NumLon*ISEC2_NumLat;
} }
else else
jlend = (jlend * 8 - bds_ubits) / ISEC4_NumBits; {
if ( jlend > 0x10000000 ) /* 2GB/8 */
jlend = (jlend*8. - bds_ubits) / ISEC4_NumBits;
else
jlend = (jlend*8 - bds_ubits) / ISEC4_NumBits;
}
ISEC4_NumValues = jlend + ioff; ISEC4_NumValues = jlend + ioff;
...@@ -9130,7 +9135,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu ...@@ -9130,7 +9135,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen); return (gribLen);
} }
static const char grb_libvers[] = "1.4.2" " of ""Jan 8 2010"" ""15:02:59"; static const char grb_libvers[] = "1.4.2" " of ""Jan 12 2010"" ""09:23:10";
const char * const char *
cgribexLibraryVersion(void) cgribexLibraryVersion(void)
{ {
......
...@@ -1797,6 +1797,7 @@ void streamWriteVarSlice(int streamID, int varID, int levelID, const double *dat ...@@ -1797,6 +1797,7 @@ void streamWriteVarSlice(int streamID, int varID, int levelID, const double *dat
} }
} }
void streamWriteContents(int streamID, char *cname) void streamWriteContents(int streamID, char *cname)
{ {
static char func[] = "streamWriteContents"; static char func[] = "streamWriteContents";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment