From fcaf572430a8eda3f6519bd21311ef7a8e3c3c1f Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 16 Jun 2001 12:08:20 -0500 Subject: [svn-r4011] Purpose: Code fix Description: Unresolved references to the image code were left behind when it was removed from the library.. Solution: Finished taking out the image stuff... Platforms tested: FreeBSD 4.3 (hawkwind) --- src/H5P.c | 37 ------------------------------------- src/H5Ppublic.h | 4 +--- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index 28544a3..1f9d7d5 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -27,11 +27,6 @@ /* Default file driver - see H5Pget_driver() */ #include "H5FDsec2.h" /* Posix unbuffered I/O file driver */ -#include "H5IMimage.h" -#include "H5IMpalette.h" - - - #ifdef WANT_H5_V1_2_COMPAT /* Other predefined file drivers */ #include "H5FDcore.h" /* Files stored entirely in memory */ @@ -46,7 +41,6 @@ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ #endif /* WANT_H5_V1_2_COMPAT */ - #define PABLO_MASK H5P_mask /* Is the interface initialized? */ @@ -346,13 +340,6 @@ H5Pcreate(H5P_class_t type) case H5P_MOUNT: src = &H5F_mount_dflt; break; - /*pvn*/ - case H5P_IMAGE: - src = &H5IM_create_dflt8bit; - break; - case H5P_PALETTE: - src = &H5IM_create_dfltpalette; - break; default: HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown property list class"); @@ -514,13 +501,6 @@ H5P_close(void *_plist) case H5P_MOUNT: break; - case H5P_IMAGE: - break; - - case H5P_PALETTE: - break; - - default: HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "unknown property list class"); @@ -708,15 +688,6 @@ H5P_copy (H5P_class_t type, const void *src) size = sizeof(H5F_mprop_t); break; - /*pvn*/ - case H5P_IMAGE: - size = sizeof(H5IM_imageinfo_t); - break; - - case H5P_PALETTE: - size = sizeof(H5IM_paletteinfo_t); - break; - default: HRETURN_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "unknown property list class"); @@ -787,14 +758,6 @@ H5P_copy (H5P_class_t type, const void *src) /* Nothing to do */ break; - case H5P_IMAGE: - /* Nothing to do */ - break; - - case H5P_PALETTE: - /* Nothing to do */ - break; - default: HRETURN_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "unknown property list class"); diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 1d3ead2..ebaeb31 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -38,9 +38,7 @@ typedef enum H5P_class_t { H5P_DATASET_CREATE = 2, /*dataset creation properties */ H5P_DATASET_XFER = 3, /*data transfer properties */ H5P_MOUNT = 4, /*file mounting properties */ - H5P_IMAGE = 5, /*image properties */ - H5P_PALETTE = 6, /*palette properties */ - H5P_NCLASSES = 7 /*this must be last! */ + H5P_NCLASSES /*this must be last! */ } H5P_class_t; /* H5P_DATASET_XFER was the name from the beginning through 1.2. It was -- cgit v0.12