Commit 65363af5 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

using CGRIBEX library version 1.4.5.1

parent fa1c08fb
2010-06-30 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5.1 (szip bug fix for 24 bit data)
2010-06-16 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5.
# Generated by GNU Autoconf 2.64 for cdi 1.4.5.1.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.4.5'
PACKAGE_STRING='cdi 1.4.5'
PACKAGE_VERSION='1.4.5.1'
PACKAGE_STRING='cdi 1.4.5.1'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
......@@ -1297,7 +1297,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.4.5 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1368,7 +1368,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.4.5:";;
short | recursive ) echo "Configuration of cdi 1.4.5.1:";;
esac
cat <<\_ACEOF
......@@ -1505,7 +1505,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.4.5
cdi configure 1.4.5.1
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2047,7 +2047,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by cdi $as_me 1.4.5, which was
It was created by cdi $as_me 1.4.5.1, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
......@@ -2847,7 +2847,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.4.5'
VERSION='1.4.5.1'
cat >>confdefs.h <<_ACEOF
......@@ -7556,7 +7556,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.4.5, which was
This file was extended by cdi $as_me 1.4.5.1, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7620,7 +7620,7 @@ Report bugs to <http://code.zmaw.de/projects/cdi>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
cdi config.status 1.4.5
cdi config.status 1.4.5.1
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.4.5], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.4.5.1], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
/* Automatically generated by m214003 at 2010-06-16, do not edit */
/* Automatically generated by m214003 at 2010-06-30, do not edit */
/* CGRIBEXLIB_VERSION="1.4.5" */
/* CGRIBEXLIB_VERSION="1.4.5.1" */
#if defined (HAVE_CONFIG_H)
# include "config.h"
......@@ -8373,7 +8373,7 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
rec_len = gribLen;
nerr = grib1Sections(dbuf, sbufsize, &pds, &gds, &bms, &bds);
nerr = grib1Sections(dbuf, dbufsize, &pds, &gds, &bms, &bds);
if ( nerr )
{
fprintf(stdout, "grib1Sections error\n");
......@@ -8383,7 +8383,7 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
#if defined (HAVE_LIBSZ)
{
int i;
long i;
int bdsLen;
int gribLenOld = 0;
int status;
......@@ -8395,6 +8395,7 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
int bds_head = 11;
int bds_ext = 0;
int bds_zoffset = 12;
unsigned char *pbuf = NULL;
if ( llarge ) bds_zoffset = 14;
......@@ -8452,25 +8453,23 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
fprintf(stderr, "%d %d %d %d\n", bds_len, datstart, bds_len - datstart, datsize);
*/
sourceLen = datsize;
destLen = dbufsize;
destLen = sbufsize;
source = bds + datstart;
dest = sbuf;
if ( bds_nbits == 24 )
{
int nelem;
char *pbuf;
long nelem;
nelem = sourceLen/3;
pbuf = (char *) malloc(sourceLen);
pbuf = (unsigned char *) malloc(sourceLen);
for ( i = 0; i < nelem; i++ )
{
pbuf[ i] = source[3*i ];
pbuf[ nelem+i] = source[3*i+1];
pbuf[2*nelem+i] = source[3*i+2];
}
memcpy(source, pbuf, sourceLen);
free(pbuf);
source = pbuf;
}
status = SZ_BufftoBuffCompress(dest, &destLen, source, sourceLen, &sz_param);
......@@ -8487,6 +8486,8 @@ int gribZip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbufs
else
Warning(func, "SZ ERROR: %d code %3d level %3d", status, PDS_Parameter, PDS_Level2);
}
if ( pbuf ) free(pbuf);
/*
fprintf(stderr, "sourceLen, destLen %d %d\n", sourceLen, destLen);
*/
......@@ -8641,7 +8642,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
#if ! defined (HAVE_LIBSZ)
static int libszwarn = 1;
#endif
int i;
long i;
int nerr;
unsigned char *pds = NULL, *gds = NULL, *bms = NULL, *bds = NULL;
int bdsLen, recLen, gribLen = 0;
......@@ -8765,10 +8766,10 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
if ( bds_nbits == 24 )
{
int nelem;
char *pbuf;
long nelem;
unsigned char *pbuf;
nelem = tmpLen/3;
pbuf = (char *) malloc(tmpLen);
pbuf = (unsigned char *) malloc(tmpLen);
for ( i = 0; i < nelem; i++ )
{
pbuf[3*i ] = dest[ i];
......@@ -8853,7 +8854,7 @@ int gribUnzip(unsigned char *dbuf, long dbufsize, unsigned char *sbuf, long sbu
return (gribLen);
}
static const char grb_libvers[] = "1.4.5" " of ""Jun 16 2010"" ""14:01:12";
static const char grb_libvers[] = "1.4.5.1" " of ""Jun 30 2010"" ""10:28:56";
const char *
cgribexLibraryVersion(void)
{
......
......@@ -413,10 +413,10 @@ size_t grbSzip(int filetype, unsigned char *gribbuffer, size_t gribbuffersize)
size_t buffersize;
static int lszip_warn = 1;
buffersize = gribbuffersize;
buffersize = gribbuffersize + 1000; /* compressed record can be greater than source record */
buffer = (unsigned char *) malloc(buffersize);
memcpy(buffer, gribbuffer, gribbuffersize);
/* memcpy(buffer, gribbuffer, gribbuffersize); */
if ( filetype == FILETYPE_GRB )
{
......
Supports Markdown
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