JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2010-12-27 Markus Koenig <basilo@users.sourceforge.net> 

* include/gdiplus/gdipluspixelformats.h (PixelFormatIndexed,
        PixelFormatGDI, PixelFormatAlpha, PixelFormatPAlpha,
        PixelFormatExtended, PixelFormatCanonical, PixelFormatUndefined,
        PixelFormatDontCare, PixelFormat1bppIndexed, PixelFormat4bppIndexed,
        PixelFormat8bppIndexed, PixelFormat16bppGrayScale,
        PixelFormat16bppRGB555, PixelFormat16bppRGB565, PixelFormat16bpp1555,
        PixelFormat24bppRGB, PixelFormat32bppRGB, PixelFormat32bppARGB,
        PixelFormat32bppPARGB, PixelFormat48bppRGB, PixelFormat64bppARGB,
        PixelFormat64bppPARGB, PixelFormatMax): Fix definition.
This commit is contained in:
Chris Sutcliffe 2010-12-27 20:39:42 +00:00
parent be26f8bde5
commit 8eb8d27274
2 changed files with 132 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/w32api/ChangeLog
View File

@ -1,3 +1,15 @@
2010-12-27 Markus Koenig <basilo@users.sourceforge.net>
* include/gdiplus/gdipluspixelformats.h (PixelFormatIndexed,
PixelFormatGDI, PixelFormatAlpha, PixelFormatPAlpha,
PixelFormatExtended, PixelFormatCanonical, PixelFormatUndefined,
PixelFormatDontCare, PixelFormat1bppIndexed, PixelFormat4bppIndexed,
PixelFormat8bppIndexed, PixelFormat16bppGrayScale,
PixelFormat16bppRGB555, PixelFormat16bppRGB565, PixelFormat16bpp1555,
PixelFormat24bppRGB, PixelFormat32bppRGB, PixelFormat32bppARGB,
PixelFormat32bppPARGB, PixelFormat48bppRGB, PixelFormat64bppARGB,
PixelFormat64bppPARGB, PixelFormatMax): Fix definition.
2010-10-20 Seth Jackson <sethj@users.sourceforge.net> 2010-10-20 Seth Jackson <sethj@users.sourceforge.net>
* include/commctrl.h (TC_ITEMHEADER[AW]): Rename to TCITEMHEADER[AW]. * include/commctrl.h (TC_ITEMHEADER[AW]): Rename to TCITEMHEADER[AW].

240
winsup/w32api/include/gdiplus/gdipluspixelformats.h
View File

@ -1,120 +1,120 @@
/* /*
* gdipluspixelformats.h * gdipluspixelformats.h
* *
* GDI+ pixel formats * GDI+ pixel formats
* *
* This file is part of the w32api package. * This file is part of the w32api package.
* *
* Contributors: * Contributors:
* Created by Markus Koenig <markus@stber-koenig.de> * Created by Markus Koenig <markus@stber-koenig.de>
* *
* THIS SOFTWARE IS NOT COPYRIGHTED * THIS SOFTWARE IS NOT COPYRIGHTED
* *
* This source code is offered for use in the public domain. You may * This source code is offered for use in the public domain. You may
* use, modify or distribute it freely. * use, modify or distribute it freely.
* *
* This code is distributed in the hope that it will be useful but * This code is distributed in the hope that it will be useful but
* WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
* DISCLAIMED. This includes but is not limited to warranties of * DISCLAIMED. This includes but is not limited to warranties of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* *
*/ */
#ifndef __GDIPLUS_PIXELFORMATS_H #ifndef __GDIPLUS_PIXELFORMATS_H
#define __GDIPLUS_PIXELFORMATS_H #define __GDIPLUS_PIXELFORMATS_H
#if __GNUC__ >=3 #if __GNUC__ >=3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
typedef DWORD ARGB; typedef DWORD ARGB;
typedef INT PixelFormat; typedef INT PixelFormat;
#define PixelFormatIndexed ((PixelFormat) 0x00010000) #define PixelFormatIndexed ((INT) 0x00010000)
#define PixelFormatGDI ((PixelFormat) 0x00020000) #define PixelFormatGDI ((INT) 0x00020000)
#define PixelFormatAlpha ((PixelFormat) 0x00040000) #define PixelFormatAlpha ((INT) 0x00040000)
#define PixelFormatPAlpha ((PixelFormat) 0x00080000) #define PixelFormatPAlpha ((INT) 0x00080000)
#define PixelFormatExtended ((PixelFormat) 0x00100000) #define PixelFormatExtended ((INT) 0x00100000)
#define PixelFormatCanonical ((PixelFormat) 0x00200000) #define PixelFormatCanonical ((INT) 0x00200000)
#define PixelFormatUndefined ((PixelFormat) 0) #define PixelFormatUndefined ((INT) 0)
#define PixelFormatDontCare ((PixelFormat) 0) #define PixelFormatDontCare ((INT) 0)
#define PixelFormat1bppIndexed ((PixelFormat) \ #define PixelFormat1bppIndexed ((INT) \
(1 | (1<<8) | PixelFormatIndexed | PixelFormatGDI)) (1 | (1<<8) | PixelFormatIndexed | PixelFormatGDI))
#define PixelFormat4bppIndexed ((PixelFormat) \ #define PixelFormat4bppIndexed ((INT) \
(2 | (4<<8) | PixelFormatIndexed | PixelFormatGDI)) (2 | (4<<8) | PixelFormatIndexed | PixelFormatGDI))
#define PixelFormat8bppIndexed ((PixelFormat) \ #define PixelFormat8bppIndexed ((INT) \
(3 | (8<<8) | PixelFormatIndexed | PixelFormatGDI)) (3 | (8<<8) | PixelFormatIndexed | PixelFormatGDI))
#define PixelFormat16bppGrayScale ((PixelFormat) \ #define PixelFormat16bppGrayScale ((INT) \
(4 | (16<<8) | PixelFormatExtended)) (4 | (16<<8) | PixelFormatExtended))
#define PixelFormat16bppRGB555 ((PixelFormat) \ #define PixelFormat16bppRGB555 ((INT) \
(5 | (16<<8) | PixelFormatGDI)) (5 | (16<<8) | PixelFormatGDI))
#define PixelFormat16bppRGB565 ((PixelFormat) \ #define PixelFormat16bppRGB565 ((INT) \
(6 | (16<<8) | PixelFormatGDI)) (6 | (16<<8) | PixelFormatGDI))
#define PixelFormat16bppARGB1555 ((PixelFormat) \ #define PixelFormat16bppARGB1555 ((INT) \
(7 | (16<<8) | PixelFormatAlpha | PixelFormatGDI)) (7 | (16<<8) | PixelFormatAlpha | PixelFormatGDI))
#define PixelFormat24bppRGB ((PixelFormat) \ #define PixelFormat24bppRGB ((INT) \
(8 | (24<<8) | PixelFormatGDI)) (8 | (24<<8) | PixelFormatGDI))
#define PixelFormat32bppRGB ((PixelFormat) \ #define PixelFormat32bppRGB ((INT) \
(9 | (32<<8) | PixelFormatGDI)) (9 | (32<<8) | PixelFormatGDI))
#define PixelFormat32bppARGB ((PixelFormat) \ #define PixelFormat32bppARGB ((INT) \
(10 | (32<<8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical)) (10 | (32<<8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical))
#define PixelFormat32bppPARGB ((PixelFormat) \ #define PixelFormat32bppPARGB ((INT) \
(11 | (32<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI)) (11 | (32<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI))
#define PixelFormat48bppRGB ((PixelFormat) \ #define PixelFormat48bppRGB ((INT) \
(12 | (48<<8) | PixelFormatExtended)) (12 | (48<<8) | PixelFormatExtended))
#define PixelFormat64bppARGB ((PixelFormat) \ #define PixelFormat64bppARGB ((INT) \
(13 | (64<<8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended)) (13 | (64<<8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended))
#define PixelFormat64bppPARGB ((PixelFormat) \ #define PixelFormat64bppPARGB ((INT) \
(14 | (64<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended)) (14 | (64<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended))
#define PixelFormatMax ((PixelFormat) 15) #define PixelFormatMax ((INT) 15)
typedef enum PaletteFlags { typedef enum PaletteFlags {
PaletteFlagsHasAlpha = 1, PaletteFlagsHasAlpha = 1,
PaletteFlagsGrayScale = 2, PaletteFlagsGrayScale = 2,
PaletteFlagsHalftone = 4 PaletteFlagsHalftone = 4
} PaletteFlags; } PaletteFlags;
typedef enum PaletteType { typedef enum PaletteType {
PaletteTypeCustom = 0, PaletteTypeCustom = 0,
PaletteTypeOptimal = 1, PaletteTypeOptimal = 1,
PaletteTypeFixedBW = 2, PaletteTypeFixedBW = 2,
PaletteTypeFixedHalftone8 = 3, PaletteTypeFixedHalftone8 = 3,
PaletteTypeFixedHalftone27 = 4, PaletteTypeFixedHalftone27 = 4,
PaletteTypeFixedHalftone64 = 5, PaletteTypeFixedHalftone64 = 5,
PaletteTypeFixedHalftone125 = 6, PaletteTypeFixedHalftone125 = 6,
PaletteTypeFixedHalftone216 = 7, PaletteTypeFixedHalftone216 = 7,
PaletteTypeFixedHalftone252 = 8, PaletteTypeFixedHalftone252 = 8,
PaletteTypeFixedHalftone256 = 9 PaletteTypeFixedHalftone256 = 9
} PaletteType; } PaletteType;
typedef struct ColorPalette { typedef struct ColorPalette {
UINT Flags; UINT Flags;
UINT Count; UINT Count;
ARGB Entries[1]; ARGB Entries[1];
} ColorPalette; } ColorPalette;
static __inline__ UINT GetPixelFormatSize(PixelFormat pixfmt) static __inline__ UINT GetPixelFormatSize(PixelFormat pixfmt)
{ {
return (((UINT) pixfmt) & 0xff00U) >> 8; return (((UINT) pixfmt) & 0xff00U) >> 8;
} }
static __inline__ BOOL IsAlphaPixelFormat(PixelFormat pixfmt) static __inline__ BOOL IsAlphaPixelFormat(PixelFormat pixfmt)
{ {
return (pixfmt & PixelFormatAlpha) != 0; return (pixfmt & PixelFormatAlpha) != 0;
} }
static __inline__ BOOL IsCanonicalPixelFormat(PixelFormat pixfmt) static __inline__ BOOL IsCanonicalPixelFormat(PixelFormat pixfmt)
{ {
return (pixfmt & PixelFormatCanonical) != 0; return (pixfmt & PixelFormatCanonical) != 0;
} }
static __inline__ BOOL IsExtendedPixelFormat(PixelFormat pixfmt) static __inline__ BOOL IsExtendedPixelFormat(PixelFormat pixfmt)
{ {
return (pixfmt & PixelFormatExtended) != 0; return (pixfmt & PixelFormatExtended) != 0;
} }
static __inline__ BOOL IsIndexedPixelFormat(PixelFormat pixfmt) static __inline__ BOOL IsIndexedPixelFormat(PixelFormat pixfmt)
{ {
return (pixfmt & PixelFormatIndexed) != 0; return (pixfmt & PixelFormatIndexed) != 0;
} }
#endif /* __GDIPLUS_PIXELFORMATS_H */ #endif /* __GDIPLUS_PIXELFORMATS_H */