Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/43af94f0e5aa3253622e2815b01a22d8615a498c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/43af94f0e5aa3253622e2815b01a22d8615a498c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/43af94f0e5aa3253622e2815b01a22d8615a498c
The branch, master has been updated
via 43af94f0e5aa3253622e2815b01a22d8615a498c (commit)
via 8de37d84aaefb0626b502ca6d6cf20edc7379875 (commit)
from b9e71cee63ec147016faf57773abadcde6924a6f (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=43af94f0e5aa3253622e2815b01a22d8615a498c
commit 43af94f0e5aa3253622e2815b01a22d8615a498c
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add missing include
diff --git a/amiga/theme.c b/amiga/theme.c
index 8076bdf..ab32b23 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -49,6 +49,7 @@
#include "amiga/bitmap.h"
#include "amiga/schedule.h"
#include "amiga/theme.h"
+#include "amiga/misc.h"
struct BitMap *throbber = NULL;
struct bitmap *throbber_nsbm = NULL;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=8de37d84aaefb0626b502ca6d6cf20edc7379875
commit 8de37d84aaefb0626b502ca6d6cf20edc7379875
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Revert back to using the guigfx built-in palette
Some colours are still a bit weird but it appears to have improved things a
bit
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 6ef5157..d048572 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -70,7 +70,6 @@ struct bitmap {
PLANEPTR native_mask;
Object *dto;
APTR drawhandle;
- APTR psm;
struct nsurl *url; /* temporary storage space */
char *title; /* temporary storage space */
ULONG *icondata; /* for appicons */
@@ -106,7 +105,6 @@ void *amiga_bitmap_create(int width, int height, unsigned
int state)
bitmap->nativebmheight = 0;
bitmap->native_mask = NULL;
bitmap->drawhandle = NULL;
- bitmap->psm = NULL;
bitmap->url = NULL;
bitmap->title = NULL;
bitmap->icondata = NULL;
@@ -152,7 +150,6 @@ void amiga_bitmap_destroy(void *bitmap)
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width,
bm->height);
if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
- if(bm->psm) DeletePenShareMap(bm->psm);
FreeVec(bm->pixdata);
if(bm->url) nsurl_unref(bm->url);
@@ -162,7 +159,6 @@ void amiga_bitmap_destroy(void *bitmap)
bm->nativebm = NULL;
bm->native_mask = NULL;
bm->drawhandle = NULL;
- bm->psm = NULL;
bm->url = NULL;
bm->title = NULL;
@@ -206,11 +202,9 @@ void amiga_bitmap_modified(void *bitmap)
ami_rtg_freebitmap(bm->nativebm);
if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
- if(bm->psm) DeletePenShareMap(bm->psm);
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
bm->nativebm = NULL;
bm->drawhandle = NULL;
- bm->psm = NULL;
bm->native_mask = NULL;
bm->native = AMI_NSBM_NONE;
}
@@ -446,12 +440,8 @@ static inline struct BitMap *ami_bitmap_get_generic(struct
bitmap *bitmap, int w
}
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,
+ bitmap->drawhandle = ObtainDrawHandle(NULL,
+
&rp, scrn->ViewPort.ColorMap,
GGFX_DitherMode, dithermode,
TAG_DONE);
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 14 ++------------
amiga/theme.c | 1 +
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 6ef5157..d048572 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -70,7 +70,6 @@ struct bitmap {
PLANEPTR native_mask;
Object *dto;
APTR drawhandle;
- APTR psm;
struct nsurl *url; /* temporary storage space */
char *title; /* temporary storage space */
ULONG *icondata; /* for appicons */
@@ -106,7 +105,6 @@ void *amiga_bitmap_create(int width, int height, unsigned
int state)
bitmap->nativebmheight = 0;
bitmap->native_mask = NULL;
bitmap->drawhandle = NULL;
- bitmap->psm = NULL;
bitmap->url = NULL;
bitmap->title = NULL;
bitmap->icondata = NULL;
@@ -152,7 +150,6 @@ void amiga_bitmap_destroy(void *bitmap)
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width,
bm->height);
if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
- if(bm->psm) DeletePenShareMap(bm->psm);
FreeVec(bm->pixdata);
if(bm->url) nsurl_unref(bm->url);
@@ -162,7 +159,6 @@ void amiga_bitmap_destroy(void *bitmap)
bm->nativebm = NULL;
bm->native_mask = NULL;
bm->drawhandle = NULL;
- bm->psm = NULL;
bm->url = NULL;
bm->title = NULL;
@@ -206,11 +202,9 @@ void amiga_bitmap_modified(void *bitmap)
ami_rtg_freebitmap(bm->nativebm);
if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
- if(bm->psm) DeletePenShareMap(bm->psm);
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
bm->nativebm = NULL;
bm->drawhandle = NULL;
- bm->psm = NULL;
bm->native_mask = NULL;
bm->native = AMI_NSBM_NONE;
}
@@ -446,12 +440,8 @@ static inline struct BitMap *ami_bitmap_get_generic(struct
bitmap *bitmap, int w
}
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,
+ bitmap->drawhandle = ObtainDrawHandle(NULL,
+
&rp, scrn->ViewPort.ColorMap,
GGFX_DitherMode, dithermode,
TAG_DONE);
diff --git a/amiga/theme.c b/amiga/theme.c
index 8076bdf..ab32b23 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -49,6 +49,7 @@
#include "amiga/bitmap.h"
#include "amiga/schedule.h"
#include "amiga/theme.h"
+#include "amiga/misc.h"
struct BitMap *throbber = NULL;
struct bitmap *throbber_nsbm = NULL;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
