mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23149] I put more condition checks with macro when DEFLATE filter is disabled.

Browse Source 
Tested on koala.
This commit is contained in:
Raymond Lu 2013-01-10 11:04:09 -05:00
parent 8eab66f667
commit 7b895e1dd8
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hl/test/test_dset_opt.c
View File

@ -90,6 +90,7 @@ const H5Z_class2_t H5Z_BOGUS2[1] = {{
*
*-------------------------------------------------------------------------
*/
#ifdef H5_HAVE_FILTER_DEFLATE
static int
test_direct_chunk_write (hid_t file)
{
@ -332,6 +333,7 @@ error:
return 1;
}
#endif /* H5_HAVE_FILTER_DEFLATE */
/*-------------------------------------------------------------------------
* Function: test_skip_compress_write1
@ -499,7 +501,7 @@ filter_bogus1(unsigned int flags, size_t UNUSED cd_nelmts,
size_t *buf_size, void **buf)
{
int *int_ptr=(int *)*buf; /* Pointer to the data values */
size_t buf_left=*buf_size; /* Amount of data buffer left to process */
ssize_t buf_left=*buf_size; /* Amount of data buffer left to process */
if(flags & H5Z_FLAG_REVERSE) { /* read */
/* Substract the "add on" value to all the data values */
@ -536,7 +538,7 @@ filter_bogus2(unsigned int flags, size_t UNUSED cd_nelmts,
size_t *buf_size, void **buf)
{
int *int_ptr=(int *)*buf; /* Pointer to the data values */
size_t buf_left=*buf_size; /* Amount of data buffer left to process */
ssize_t buf_left=*buf_size; /* Amount of data buffer left to process */
if(flags & H5Z_FLAG_REVERSE) { /* read */
/* Substract the "add on" value to all the data values */
@ -948,7 +950,6 @@ test_invalid_parameters(hid_t file)
unsigned filter_mask = 0;
int direct_buf[CHUNK_NX][CHUNK_NY];
int check_chunk[CHUNK_NX][CHUNK_NY];
hsize_t offset[2] = {0, 0};
size_t buf_size = CHUNK_NX*CHUNK_NY*sizeof(int);
int aggression = 9; /* Compression aggression setting */

20
perform/dectris_perf.c
View File

@ -20,7 +20,6 @@
#include "hdf5.h"
#include "H5private.h"
#include <zlib.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
@ -29,7 +28,17 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#ifdef H5_HAVE_FILTER_DEFLATE
#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
# define H5_ZLIB_HEADER "zlib.h"
#endif
#if defined(H5_ZLIB_HEADER)
# include H5_ZLIB_HEADER /* "zlib.h" */
#endif
const char *FILENAME[] = {
"dectris_perf",
"unix.raw",
@ -637,3 +646,12 @@ main (void)
h5_cleanup(FILENAME, fapl);
return 0;
}
#else
int
main (void)
{
printf("Skipped because DEFLATE filter is disabled");
return 0;
}
#endif /* H5_HAVE_FILTER_DEFLATE */

18
test/dectris_tst.c
View File

@ -19,10 +19,18 @@
*/
#include "h5test.h"
#include <zlib.h>
#include <math.h>
#include <stdlib.h>
#ifdef H5_HAVE_FILTER_DEFLATE
#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
# define H5_ZLIB_HEADER "zlib.h"
#endif
#if defined(H5_ZLIB_HEADER)
# include H5_ZLIB_HEADER /* "zlib.h" */
#endif
const char *FILENAME[] = {
"dectris",
NULL
@ -308,3 +316,11 @@ error:
return 1;
}
#else
int
main(void)
{
TESTING("Skipped because DEFLATE filter is disabled");
return 0;
}
#endif /* H5_HAVE_FILTER_DEFLATE */