The enumeration WRImgFormat, a list of Image formats is moved from the imgformat.h file to wraster.h file.
This list of image formats could be used by other files to know the supported image formats. Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- wrlib/imgformat.h | 17 ----------------- wrlib/wraster.h | 21 +++++++++++++++------ 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/wrlib/imgformat.h b/wrlib/imgformat.h index 07b021a..f75c219 100644 --- a/wrlib/imgformat.h +++ b/wrlib/imgformat.h @@ -29,22 +29,6 @@ #ifndef IMGFORMAT_INTERNAL_H #define IMGFORMAT_INTERNAL_H - -typedef enum { - IM_ERROR = -1, - IM_UNKNOWN = 0, - IM_XPM = 1, - IM_TIFF = 2, - IM_PNG = 3, - IM_PPM = 4, - IM_JPEG = 5, - IM_GIF = 6 -} WRImgFormat; - -/* How many image types we have. */ -/* Increase this when adding new image types! */ -#define IM_TYPES 6 - /* * Function for Loading in a specific format */ @@ -73,5 +57,4 @@ RImage *RLoadGIF(const char *file, int index); */ Bool RSaveXPM(RImage *image, const char *file); - #endif diff --git a/wrlib/wraster.h b/wrlib/wraster.h index ff2b2c3..1c13e58 100644 --- a/wrlib/wraster.h +++ b/wrlib/wraster.h @@ -80,10 +80,21 @@ extern "C" { /* standard colormap usage */ #define RC_StandardColormap (1<<7) - - - - +/* How many image types we have. */ +/* Increase this when adding new image types! */ +#define IM_TYPES 6 + +/* Update define IM_TYPES if modify WRImgFormat! */ +typedef enum { + IM_ERROR = -1, + IM_UNKNOWN = 0, + IM_XPM = 1, + IM_TIFF = 2, + IM_PNG = 3, + IM_PPM = 4, + IM_JPEG = 5, + IM_GIF = 6 +} WRImgFormat; /* std colormap usage/creation modes */ enum { @@ -93,8 +104,6 @@ enum { RIgnoreStdColormap }; - - typedef struct RContextAttributes { int flags; int render_mode; -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
