summaryrefslogtreecommitdiffstats
path: root/hl/examples/ex_image2.c
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2014-04-01 15:42:43 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2014-04-01 15:42:43 (GMT)
commit72e8017eadf211257caceb43095b2aed76e81632 (patch)
tree0fae8d91bc2587a7b3b44129c5afaf37d4842098 /hl/examples/ex_image2.c
parentd4c2e51d1e255fde2c0b2e359078cfd0de82720a (diff)
parentc86aedeba1f683daaf0289435450fd4e518fecc4 (diff)
downloadhdf5-72e8017eadf211257caceb43095b2aed76e81632.zip
hdf5-72e8017eadf211257caceb43095b2aed76e81632.tar.gz
hdf5-72e8017eadf211257caceb43095b2aed76e81632.tar.bz2
[svn-r24940] merge from trunk.
Diffstat (limited to 'hl/examples/ex_image2.c')
-rw-r--r--hl/examples/ex_image2.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index 76c3a75..3276f7c 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -26,7 +26,7 @@
#define PAL_ENTRIES 256
static int read_data(const char* file_name, hsize_t *width, hsize_t *height );
-unsigned char *gbuf = 0; /* global buffer for image data */
+unsigned char *gbuf = NULL; /* global buffer for image data */
int main( void )
{
@@ -79,18 +79,25 @@ int main( void )
/* make dataset */
status=H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
- if (gbuf) {
- free(gbuf);
- gbuf = NULL;
- }
/* close the file. */
H5Fclose( file_id );
+ if(gbuf) {
+ free(gbuf);
+ gbuf = NULL;
+ }
+
return 0;
out:
printf("Error on return function...Exiting\n");
+
+ if(gbuf) {
+ free(gbuf);
+ gbuf = NULL;
+ }
+
return 1;
}