Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5241871889699a07679a2097f56e4a9933b245b6
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5241871889699a07679a2097f56e4a9933b245b6
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5241871889699a07679a2097f56e4a9933b245b6
The branch, chris/quant has been updated
via 5241871889699a07679a2097f56e4a9933b245b6 (commit)
from c13977e353dcdc9f8a24ab939f2eeb06cf9330c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5241871889699a07679a2097f56e4a9933b245b6
commit 5241871889699a07679a2097f56e4a9933b245b6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
guigfx expects ARGB rather than RGBA
This didn't appear to be working previously because the fixed palette is
terrible
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 1d836e3..bcd761e 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -451,10 +451,12 @@ static inline struct BitMap
*ami_bitmap_get_generic(struct bitmap *bitmap, int w
break;
}
+ ami_bitmap_rgba_to_argb(bitmap);
bitmap->psm = CreatePenShareMap(TAG_DONE);
AddPixelArray(bitmap->psm, (ULONG
*)amiga_bitmap_get_buffer(bitmap),
bitmap->width,
bitmap->height,
GGFX_PixelFormat, PIXFMT_0RGB_32, TAG_DONE);
+
bitmap->drawhandle =
ObtainDrawHandle(bitmap->psm, &rp, scrn->ViewPort.ColorMap,
GGFX_DitherMode, dithermode,
TAG_DONE);
@@ -463,10 +465,9 @@ static inline struct BitMap *ami_bitmap_get_generic(struct
bitmap *bitmap, int w
bitmap->width, bitmap->height,
bitmap->width, bitmap->height, NULL);
- DirectDrawTrueColor(ddh, (ULONG
*)amiga_bitmap_get_buffer(bitmap), 0, 0,
-
TAG_DONE);
-
+ DirectDrawTrueColor(ddh, (ULONG
*)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
DeleteDirectDrawHandle(ddh);
+ ami_bitmap_argb_to_rgba(bitmap);
}
}
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 1d836e3..bcd761e 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -451,10 +451,12 @@ static inline struct BitMap
*ami_bitmap_get_generic(struct bitmap *bitmap, int w
break;
}
+ ami_bitmap_rgba_to_argb(bitmap);
bitmap->psm = CreatePenShareMap(TAG_DONE);
AddPixelArray(bitmap->psm, (ULONG
*)amiga_bitmap_get_buffer(bitmap),
bitmap->width,
bitmap->height,
GGFX_PixelFormat, PIXFMT_0RGB_32, TAG_DONE);
+
bitmap->drawhandle =
ObtainDrawHandle(bitmap->psm, &rp, scrn->ViewPort.ColorMap,
GGFX_DitherMode, dithermode,
TAG_DONE);
@@ -463,10 +465,9 @@ static inline struct BitMap *ami_bitmap_get_generic(struct
bitmap *bitmap, int w
bitmap->width, bitmap->height,
bitmap->width, bitmap->height, NULL);
- DirectDrawTrueColor(ddh, (ULONG
*)amiga_bitmap_get_buffer(bitmap), 0, 0,
-
TAG_DONE);
-
+ DirectDrawTrueColor(ddh, (ULONG
*)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
DeleteDirectDrawHandle(ddh);
+ ami_bitmap_argb_to_rgba(bitmap);
}
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org