diff options
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf_types.h')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index 203a7268581..81512adf065 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -1,4 +1,4 @@ -/** +/* * IMB_imbuf_types.h (mar-2001 nzc) * * Types needed for using the image buffer. @@ -54,7 +54,6 @@ struct ImMetaData; #define IB_FILENAME_SIZE 1023 /** - * \brief The basic imbuf type * \ingroup imbuf * This is the abstraction of an image. ImBuf is the basic type used for all * imbuf operations. @@ -71,7 +70,11 @@ typedef struct ImBuf { struct ImBuf *next, *prev; /**< allow lists of ImBufs, for caches or flipbooks */ /* dimensions */ - short x, y; /* width and Height of our image buffer */ + int x, y; /* width and Height of our image buffer. + * Should be 'unsigned int' since most formats use this. + * but this is problematic with texture math in imagetexture.c + * avoid problems and use int. - campbell */ + unsigned char depth; /* Active amount of bits/bitplanes */ int channels; /* amount of channels in rect_float (0 = 4 channel default) */ @@ -127,17 +130,13 @@ typedef struct ImBuf { /* Moved from BKE_bmfont_types.h because it is a userflag bit mask. */ /** - * \brief Flags used internally by blender for imagebuffers + * \brief userflags: Flags used internally by blender for imagebuffers */ #define IB_BITMAPFONT (1 << 0) /* this image is a font */ #define IB_BITMAPDIRTY (1 << 1) /* image needs to be saved is not the same as filename */ - -/* From iff.h. This was once moved away by Frank, now Nzc moves it - * back. Such is the way it is... It is a long list of defines, and - * there are a few external defines in the back. Most of the stuff is - * probably imbuf_intern only. This will need to be merged later - * on. */ +#define IB_MIPMAP_INVALID (1 << 2) /* image mipmaps are invalid, need recreate */ +#define IB_RECT_INVALID (1 << 3) /* float buffer changed, needs recreation of byte rect */ /** * \name Imbuf Component flags |