# HG changeset patch # User arpi # Date 1011143962 0 # Node ID f5c38da17b596ad695dbbd7aa7d42be7f80c1e8e # Parent 85c90bb8729a7e28d124a8d2cb6e437bb20391a0 bpp != depth diff -r 85c90bb8729a -r f5c38da17b59 mp_image.h --- a/mp_image.h Wed Jan 16 00:14:59 2002 +0000 +++ b/mp_image.h Wed Jan 16 01:19:22 2002 +0000 @@ -13,9 +13,14 @@ // set if it's swapped plane/byteorder #define MP_IMGFLAG_SWAPPED 0x40 +#define MP_IMGTYPE_EXPORT 0 +#define MP_IMGTYPE_STATIC 1 +#define MP_IMGTYPE_TEMP 2 + typedef struct mp_image_s { unsigned short flags; - unsigned short bpp; + unsigned char type; + unsigned char bpp; // bits/pixel. NOT depth! for RGB it will be n*8 unsigned int imgfmt; int width,height; // stored dimensions int x,y,w,h; // visible dimensions @@ -30,11 +35,11 @@ mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); mpi->out_fmt=out_fmt; if( (out_fmt&IMGFMT_RGB_MASK) == IMGFMT_RGB ){ - mpi->bpp=out_fmt&255; + mpi->bpp=((out_fmt&255)+7)&(~7); return; } if( (out_fmt&IMGFMT_BGR_MASK) == IMGFMT_BGR ){ - mpi->bpp=out_fmt&255; + mpi->bpp=((out_fmt&255)+7)&(~7); mpi->flags|=MP_IMGFLAG_SWAPPED; return; }