aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/gdisp_image.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-11-11 19:20:10 +1000
committerinmarket <andrewh@inmarket.com.au>2015-11-11 19:20:10 +1000
commitf48b492303d87349d054c80727000d9a66c9f094 (patch)
treee73a672198b7004fe9faf055471eaf6cf7a7d202 /src/gdisp/gdisp_image.h
parent1fa5677d449c510362a800048fbd3c4b93e86a67 (diff)
downloaduGFX-f48b492303d87349d054c80727000d9a66c9f094.tar.gz
uGFX-f48b492303d87349d054c80727000d9a66c9f094.tar.bz2
uGFX-f48b492303d87349d054c80727000d9a66c9f094.zip
Clean up endian support for images based on new system defines
Remove deprecated image functions
Diffstat (limited to 'src/gdisp/gdisp_image.h')
-rw-r--r--src/gdisp/gdisp_image.h59
1 files changed, 0 insertions, 59 deletions
diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h
index 1ab320e4..4613bea7 100644
--- a/src/gdisp/gdisp_image.h
+++ b/src/gdisp/gdisp_image.h
@@ -52,52 +52,6 @@ typedef uint16_t gdispImageFlags;
#define GDISP_IMAGE_FLG_ANIMATED 0x0002 /* The image has animation */
#define GDISP_IMAGE_FLG_MULTIPAGE 0x0004 /* The image has multiple pages */
-struct gdispImageIO;
-
-/**
- * @brief An image IO close function
- *
- * @param[in] pio Pointer to the io structure
- * @param[in] desc The descriptor. A filename or an image structure pointer.
- *
- */
-typedef void (*gdispImageIOCloseFn)(struct gdispImageIO *pio);
-
-/**
- * @brief An image IO read function
- * @returns The number of bytes actually read or 0 on error
- *
- * @param[in] pio Pointer to the io structure
- * @param[in] buf Where the results should be placed
- * @param[in] len The number of bytes to read
- *
- */
-typedef size_t (*gdispImageIOReadFn)(struct gdispImageIO *pio, void *buf, size_t len);
-
-/**
- * @brief An image IO seek function
- *
- * @param[in] pio Pointer to the io structure
- * @param[in] pos Which byte to seek to relative to the start of the "file".
- *
- */
-typedef void (*gdispImageIOSeekFn)(struct gdispImageIO *pio, size_t pos);
-
-typedef struct gdispImageIOFunctions {
- gdispImageIOReadFn read; /* @< The function to read input */
- gdispImageIOSeekFn seek; /* @< The function to seek input */
- gdispImageIOCloseFn close; /* @< The function to close input */
- } gdispImageIOFunctions;
-
-/**
- * @brief The structure defining the IO routines for image handling
- */
-typedef struct gdispImageIO {
- const void * fd; /* @< The "file" descriptor */
- size_t pos; /* @< The current "file" position */
- const gdispImageIOFunctions *fns; /* @< The current "file" functions */
-} gdispImageIO;
-
/**
* @brief The structure for an image
*/
@@ -119,19 +73,6 @@ typedef struct gdispImage {
extern "C" {
#endif
- /*
- * Deprecated Functions.
- */
- gdispImageError DEPRECATED("Use gdispImageOpenGFile() instead") gdispImageOpen(gdispImage *img);
- bool_t DEPRECATED("Use gdispImageOpenMemory() instead") gdispImageSetMemoryReader(gdispImage *img, const void *memimage);
- #if GFX_USE_OS_CHIBIOS
- bool_t DEPRECATED("Use gdispImageOpenBaseFileStream() instead") gdispImageSetBaseFileStreamReader(gdispImage *img, void *BaseFileStreamPtr);
- #endif
- #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX
- bool_t DEPRECATED("Please use gdispImageOpenFile() instead") gdispImageSetFileReader(gdispImage *img, const char *filename);
- #define gdispImageSetSimulFileReader(img, fname) gdispImageSetFileReader(img, fname)
- #endif
-
/**
* @brief Initialise a gdispImage object
*