From cce28c09fa9275339dbfe3b9af9999c069fe58ad Mon Sep 17 00:00:00 2001
From: Uwe Schulzweida <uwe.schulzweida@mpimet.mpg.de>
Date: Wed, 21 Jun 2006 08:01:27 +0000
Subject: [PATCH] Update GRIB library
---
src/griblib.c | 14 ++++++++++----
src/stream_cdf.c | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/griblib.c b/src/griblib.c
index 3a2896097..94833ae52 100644
--- a/src/griblib.c
+++ b/src/griblib.c
@@ -1,5 +1,5 @@
-/* Generated automatically from m214003 on Thu Jun 15 13:28:06 CEST 2006 */
+/* Generated automatically from m214003 on Tue Jun 20 08:25:24 CEST 2006 */
#if defined (HAVE_CONFIG_H)
# include "config.h"
@@ -7095,7 +7095,13 @@ void gribPrintBDS(int nrec, long recpos, long recsize, unsigned char *gribbuffer
/* #define SZTEST */
#if defined (HAVE_LIBSZ)
+#if defined(__cplusplus)
+extern "C" {
+#endif
# include "szlib.h"
+#if defined (__cplusplus)
+}
+#endif
# define OPTIONS_MASK (SZ_RAW_OPTION_MASK | SZ_MSB_OPTION_MASK | SZ_NN_OPTION_MASK)
# define PIXELS_PER_BLOCK (8)
@@ -7443,7 +7449,7 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
int status;
int datstart, datsize;
SZ_com_t sz_param; /* szip parameter block */
- char *dest, *source;
+ unsigned char *dest, *source;
size_t destLen, sourceLen;
int bds_len, bds_nbits, bds_flag, bds_rep, bds_cplx, bds_aflag;
int lnil;
@@ -7569,7 +7575,7 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
#endif
- status= SZ_BufftoBuffCompress(dest, &destLen, source, sourceLen, &sz_param);
+ status = SZ_BufftoBuffCompress(dest, &destLen, source, sourceLen, &sz_param);
if ( status != SZ_OK )
{
if ( status == SZ_NO_ENCODER_ERROR )
@@ -7871,7 +7877,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
-static const char grb_libvers[] = "1.0.0" " of ""Jun 15 2006"" ""13:28:07";
+static const char grb_libvers[] = "1.0.0" " of ""Jun 20 2006"" ""08:25:24";
diff --git a/src/stream_cdf.c b/src/stream_cdf.c
index 899b8b2a3..36506884c 100644
--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -3468,10 +3468,10 @@ int cdfInqContents(int streamID)
{
if ( nvdims > 0 )
Warning(func, "axis attribute length %d does not match nvdim %d for %s",
- attlen, nvdims, name);
+ (int) attlen, nvdims, name);
if ( nvdims > 0 )
{
- fprintf(stderr, "attlen %d %d %d\n", strlen(attstring), attlen, nvdims);
+ fprintf(stderr, "attlen %d %d %d\n", (int) strlen(attstring), (int) attlen, nvdims);
for ( i = 0; i < (int)attlen; i++ )
fprintf(stderr, " %d %d %c\n", i, (int) attstring[i], attstring[i]);
}
--
GitLab