2
0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00

[svn-r29531] Normalization w/ revise_chunks in preparation for big merge.

hl and bin directories

Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
           autotools serial w/ Java, Fortran, & C++
This commit is contained in:
Dana Robinson 2016-03-23 11:50:42 -05:00
parent 0e8941b088
commit 710d1caf54
5 changed files with 6 additions and 11 deletions

@ -29,7 +29,7 @@ exit_code=0
# and should have invoked as "$srcdir/bin/$progname" or
# "bin/$progname". So, by striping bin/$program from $0,
# we can find $srcdir.
if [ $0 == bin/$progname ]; then
if [ "$0" = "bin/${progname}" ]; then
srcdir="." # current directory
else
# $0 is $srdir/bin/$progname

@ -22,17 +22,13 @@ extern "C" {
/*-------------------------------------------------------------------------
*
* Direct chunk write function
* "Optimized dataset" routines.
*
*-------------------------------------------------------------------------
*/
H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id,
hid_t dxpl_id,
uint32_t filters,
const hsize_t *offset,
size_t data_size,
const void *buf);
H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters,
const hsize_t *offset, size_t data_size, const void *buf);
#ifdef __cplusplus
}

@ -3248,7 +3248,7 @@ out:
*
*-------------------------------------------------------------------------
*/
static
H5_ATTR_PURE static
hbool_t H5TB_find_field(const char *field, const char *field_list)
{
const char *start = field_list;

@ -1,4 +1,3 @@
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.

@ -41,7 +41,7 @@
#define CHUNK_NX 4
#define CHUNK_NY 4
#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*1.001F)+12)
#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*(double)1.001F)+12)
/* Temporary filter IDs used for testing */
#define H5Z_FILTER_BOGUS1 305