summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--winsup/w32api/ChangeLog12
-rwxr-xr-xwinsup/w32api/include/gdiplus/gdipluspixelformats.h240
2 files changed, 132 insertions, 120 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 365e40e42..2b84ef612 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -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>
* include/commctrl.h (TC_ITEMHEADER[AW]): Rename to TCITEMHEADER[AW].
diff --git a/winsup/w32api/include/gdiplus/gdipluspixelformats.h b/winsup/w32api/include/gdiplus/gdipluspixelformats.h
index d5d806cb8..ea51cc712 100755
--- a/winsup/w32api/include/gdiplus/gdipluspixelformats.h
+++ b/winsup/w32api/include/gdiplus/gdipluspixelformats.h
@@ -1,120 +1,120 @@
-/*
- * gdipluspixelformats.h
- *
- * GDI+ pixel formats
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- * Created by Markus Koenig <markus@stber-koenig.de>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __GDIPLUS_PIXELFORMATS_H
-#define __GDIPLUS_PIXELFORMATS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-typedef DWORD ARGB;
-typedef INT PixelFormat;
-
-#define PixelFormatIndexed ((PixelFormat) 0x00010000)
-#define PixelFormatGDI ((PixelFormat) 0x00020000)
-#define PixelFormatAlpha ((PixelFormat) 0x00040000)
-#define PixelFormatPAlpha ((PixelFormat) 0x00080000)
-#define PixelFormatExtended ((PixelFormat) 0x00100000)
-#define PixelFormatCanonical ((PixelFormat) 0x00200000)
-#define PixelFormatUndefined ((PixelFormat) 0)
-#define PixelFormatDontCare ((PixelFormat) 0)
-#define PixelFormat1bppIndexed ((PixelFormat) \
- (1 | (1<<8) | PixelFormatIndexed | PixelFormatGDI))
-#define PixelFormat4bppIndexed ((PixelFormat) \
- (2 | (4<<8) | PixelFormatIndexed | PixelFormatGDI))
-#define PixelFormat8bppIndexed ((PixelFormat) \
- (3 | (8<<8) | PixelFormatIndexed | PixelFormatGDI))
-#define PixelFormat16bppGrayScale ((PixelFormat) \
- (4 | (16<<8) | PixelFormatExtended))
-#define PixelFormat16bppRGB555 ((PixelFormat) \
- (5 | (16<<8) | PixelFormatGDI))
-#define PixelFormat16bppRGB565 ((PixelFormat) \
- (6 | (16<<8) | PixelFormatGDI))
-#define PixelFormat16bppARGB1555 ((PixelFormat) \
- (7 | (16<<8) | PixelFormatAlpha | PixelFormatGDI))
-#define PixelFormat24bppRGB ((PixelFormat) \
- (8 | (24<<8) | PixelFormatGDI))
-#define PixelFormat32bppRGB ((PixelFormat) \
- (9 | (32<<8) | PixelFormatGDI))
-#define PixelFormat32bppARGB ((PixelFormat) \
- (10 | (32<<8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical))
-#define PixelFormat32bppPARGB ((PixelFormat) \
- (11 | (32<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI))
-#define PixelFormat48bppRGB ((PixelFormat) \
- (12 | (48<<8) | PixelFormatExtended))
-#define PixelFormat64bppARGB ((PixelFormat) \
- (13 | (64<<8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended))
-#define PixelFormat64bppPARGB ((PixelFormat) \
- (14 | (64<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended))
-#define PixelFormatMax ((PixelFormat) 15)
-
-typedef enum PaletteFlags {
- PaletteFlagsHasAlpha = 1,
- PaletteFlagsGrayScale = 2,
- PaletteFlagsHalftone = 4
-} PaletteFlags;
-
-typedef enum PaletteType {
- PaletteTypeCustom = 0,
- PaletteTypeOptimal = 1,
- PaletteTypeFixedBW = 2,
- PaletteTypeFixedHalftone8 = 3,
- PaletteTypeFixedHalftone27 = 4,
- PaletteTypeFixedHalftone64 = 5,
- PaletteTypeFixedHalftone125 = 6,
- PaletteTypeFixedHalftone216 = 7,
- PaletteTypeFixedHalftone252 = 8,
- PaletteTypeFixedHalftone256 = 9
-} PaletteType;
-
-typedef struct ColorPalette {
- UINT Flags;
- UINT Count;
- ARGB Entries[1];
-} ColorPalette;
-
-static __inline__ UINT GetPixelFormatSize(PixelFormat pixfmt)
-{
- return (((UINT) pixfmt) & 0xff00U) >> 8;
-}
-
-static __inline__ BOOL IsAlphaPixelFormat(PixelFormat pixfmt)
-{
- return (pixfmt & PixelFormatAlpha) != 0;
-}
-
-static __inline__ BOOL IsCanonicalPixelFormat(PixelFormat pixfmt)
-{
- return (pixfmt & PixelFormatCanonical) != 0;
-}
-
-static __inline__ BOOL IsExtendedPixelFormat(PixelFormat pixfmt)
-{
- return (pixfmt & PixelFormatExtended) != 0;
-}
-
-static __inline__ BOOL IsIndexedPixelFormat(PixelFormat pixfmt)
-{
- return (pixfmt & PixelFormatIndexed) != 0;
-}
-
-#endif /* __GDIPLUS_PIXELFORMATS_H */
+/*
+ * gdipluspixelformats.h
+ *
+ * GDI+ pixel formats
+ *
+ * This file is part of the w32api package.
+ *
+ * Contributors:
+ * Created by Markus Koenig <markus@stber-koenig.de>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef __GDIPLUS_PIXELFORMATS_H
+#define __GDIPLUS_PIXELFORMATS_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+typedef DWORD ARGB;
+typedef INT PixelFormat;
+
+#define PixelFormatIndexed ((INT) 0x00010000)
+#define PixelFormatGDI ((INT) 0x00020000)
+#define PixelFormatAlpha ((INT) 0x00040000)
+#define PixelFormatPAlpha ((INT) 0x00080000)
+#define PixelFormatExtended ((INT) 0x00100000)
+#define PixelFormatCanonical ((INT) 0x00200000)
+#define PixelFormatUndefined ((INT) 0)
+#define PixelFormatDontCare ((INT) 0)
+#define PixelFormat1bppIndexed ((INT) \
+ (1 | (1<<8) | PixelFormatIndexed | PixelFormatGDI))
+#define PixelFormat4bppIndexed ((INT) \
+ (2 | (4<<8) | PixelFormatIndexed | PixelFormatGDI))
+#define PixelFormat8bppIndexed ((INT) \
+ (3 | (8<<8) | PixelFormatIndexed | PixelFormatGDI))
+#define PixelFormat16bppGrayScale ((INT) \
+ (4 | (16<<8) | PixelFormatExtended))
+#define PixelFormat16bppRGB555 ((INT) \
+ (5 | (16<<8) | PixelFormatGDI))
+#define PixelFormat16bppRGB565 ((INT) \
+ (6 | (16<<8) | PixelFormatGDI))
+#define PixelFormat16bppARGB1555 ((INT) \
+ (7 | (16<<8) | PixelFormatAlpha | PixelFormatGDI))
+#define PixelFormat24bppRGB ((INT) \
+ (8 | (24<<8) | PixelFormatGDI))
+#define PixelFormat32bppRGB ((INT) \
+ (9 | (32<<8) | PixelFormatGDI))
+#define PixelFormat32bppARGB ((INT) \
+ (10 | (32<<8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical))
+#define PixelFormat32bppPARGB ((INT) \
+ (11 | (32<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI))
+#define PixelFormat48bppRGB ((INT) \
+ (12 | (48<<8) | PixelFormatExtended))
+#define PixelFormat64bppARGB ((INT) \
+ (13 | (64<<8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended))
+#define PixelFormat64bppPARGB ((INT) \
+ (14 | (64<<8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended))
+#define PixelFormatMax ((INT) 15)
+
+typedef enum PaletteFlags {
+ PaletteFlagsHasAlpha = 1,
+ PaletteFlagsGrayScale = 2,
+ PaletteFlagsHalftone = 4
+} PaletteFlags;
+
+typedef enum PaletteType {
+ PaletteTypeCustom = 0,
+ PaletteTypeOptimal = 1,
+ PaletteTypeFixedBW = 2,
+ PaletteTypeFixedHalftone8 = 3,
+ PaletteTypeFixedHalftone27 = 4,
+ PaletteTypeFixedHalftone64 = 5,
+ PaletteTypeFixedHalftone125 = 6,
+ PaletteTypeFixedHalftone216 = 7,
+ PaletteTypeFixedHalftone252 = 8,
+ PaletteTypeFixedHalftone256 = 9
+} PaletteType;
+
+typedef struct ColorPalette {
+ UINT Flags;
+ UINT Count;
+ ARGB Entries[1];
+} ColorPalette;
+
+static __inline__ UINT GetPixelFormatSize(PixelFormat pixfmt)
+{
+ return (((UINT) pixfmt) & 0xff00U) >> 8;
+}
+
+static __inline__ BOOL IsAlphaPixelFormat(PixelFormat pixfmt)
+{
+ return (pixfmt & PixelFormatAlpha) != 0;
+}
+
+static __inline__ BOOL IsCanonicalPixelFormat(PixelFormat pixfmt)
+{
+ return (pixfmt & PixelFormatCanonical) != 0;
+}
+
+static __inline__ BOOL IsExtendedPixelFormat(PixelFormat pixfmt)
+{
+ return (pixfmt & PixelFormatExtended) != 0;
+}
+
+static __inline__ BOOL IsIndexedPixelFormat(PixelFormat pixfmt)
+{
+ return (pixfmt & PixelFormatIndexed) != 0;
+}
+
+#endif /* __GDIPLUS_PIXELFORMATS_H */
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 04:34:37 +0000