diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-09 16:43:05 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-09 16:43:05 (GMT) |
| commit | 162497a3f96431c4942562379e57dde131d3a693 (patch) | |
| tree | 172525cb72b3f5a1877d66c3b1e3e4badbe0d9ec /hl/tools/gif2h5 | |
| parent | 9c3900d0bf05a65e59cce6dc613b38b240599d93 (diff) | |
| parent | c087ef41b637686ae5e783bfb0a48e91dbe3f58e (diff) | |
| download | hdf5-162497a3f96431c4942562379e57dde131d3a693.zip hdf5-162497a3f96431c4942562379e57dde131d3a693.tar.gz hdf5-162497a3f96431c4942562379e57dde131d3a693.tar.bz2 | |
Merge pull request #2031 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c087ef41b637686ae5e783bfb0a48e91dbe3f58e': (28 commits)
Add H5Rdestroy calls to cleanup
Remove problem tests for now
Add new test reference
HDFFV-10876 fix compare reference
HDFFV-10876 ignore old reference API tests
Add missing quotes
Fix windows 10 compile error
Correct indentation
Revert declaration used in macro.
Revert declaration deletion.
HDFFV-10876 add note
Address compile warnings
Fix compile errors - mostly in jni
HDFFV-10876 Update dump to match DDL spec
Add extra line
Adjust whitespace
Update h5ls help and rework dump_mem routines for attrs
Update create calls
Add debug compile option as comment
Update reference calls
...
Diffstat (limited to 'hl/tools/gif2h5')
| -rw-r--r-- | hl/tools/gif2h5/gif.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h index ed1cc81..221e178 100644 --- a/hl/tools/gif2h5/gif.h +++ b/hl/tools/gif2h5/gif.h @@ -27,16 +27,28 @@ #define MAX_PAL 768 /* typedef H5T_NATIVE_UINT8 BYTE; */ +#ifndef BYTE typedef unsigned char BYTE; +#endif /* typedef H5T_NATIVE_UINT16 WORD; */ +#ifndef WORD typedef unsigned long WORD; +#endif +#ifndef CHAR typedef char CHAR; +#endif +#ifndef boolean typedef unsigned char boolean; +#endif +#ifndef false #define false 0 +#endif +#ifndef true #define true 1 +#endif /* Set the EndianOrder. ** The GIF Reader file should do this. @@ -128,12 +140,12 @@ typedef struct _GifCommentExtension { ** extension. */ typedef struct _GifToMem { - GIFHEAD *GifHeader; - GIFIMAGEDESC **GifImageDesc; - GIFGRAPHICCONTROL **GifGraphicControlExtension; - GIFPLAINTEXT **GifPlainTextExtension; - GIFAPPLICATION **GifApplicationExtension; - GIFCOMMENT **GifCommentExtension; + GIFHEAD *GifHeader; + GIFIMAGEDESC **GifImageDesc; + GIFGRAPHICCONTROL **GifGraphicControlExtension; + GIFPLAINTEXT **GifPlainTextExtension; + GIFAPPLICATION **GifApplicationExtension; + GIFCOMMENT **GifCommentExtension; } GIFTOMEM; /* |