diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-08-05 14:29:12 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-08-05 14:29:12 +0100 |
| commit | a46c5ae09f2a1fe048b0da5418cf9ed33f512166 (patch) | |
| tree | 6e3d6b6b1defdbbe5d154a876bc2b23c1551c97d /amiga | |
| parent | 55c08431ee40a28589ff3278a51f61a6847b7f4e (diff) | |
| parent | 7716143240429371e8f357ddc44d15d343759ae1 (diff) | |
| download | netsurf-a46c5ae09f2a1fe048b0da5418cf9ed33f512166.tar.gz netsurf-a46c5ae09f2a1fe048b0da5418cf9ed33f512166.tar.bz2 | |
Merge branch 'master' into chris/palette-mapped-plotters
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/Makefile.target | 6 | ||||
| -rw-r--r-- | amiga/bitmap.c | 4 | ||||
| -rw-r--r-- | amiga/dt_picture.c | 2 | ||||
| -rwxr-xr-x | amiga/gui.c | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index fb0259c59..f2d23bbc0 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -52,16 +52,16 @@ else CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl libcares openssl) - CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libhubbub libcss) + CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss) LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libcares openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libhubbub libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib ifeq ($(SUBTARGET),os3) LDFLAGS += -liconv else - LDFLAGS += -lauto + LDFLAGS += -lauto -lpbl endif EXETARGET := NetSurf diff --git a/amiga/bitmap.c b/amiga/bitmap.c index 4e1057eb6..ce665aaf7 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -208,7 +208,7 @@ bool bitmap_test_opaque(void *bitmap) for(a=0;a<p;a+=4) { - if ((*bmi & 0x000000ffU) != 0x000000ffU) return false; + if ((*bmi & 0xff000000U) != 0xff000000U) return false; bmi++; } return true; @@ -328,6 +328,8 @@ struct bitmap *ami_bitmap_from_datatype(char *filename) IDoMethod(dto, PDTM_READPIXELARRAY, bitmap_get_buffer(bm), PBPAFMT_RGBA, bitmap_get_rowstride(bm), 0, 0, bmh->bmh_Width, bmh->bmh_Height); + + bitmap_set_opaque(bm, bitmap_test_opaque(bm)); } DisposeDTObject(dto); } diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index 15ae40dae..b6e0a91b7 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -159,6 +159,8 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) bm_buffer, bm_format, bitmap_get_rowstride(bitmap), 0, 0, c->width, c->height); + bitmap_set_opaque(bitmap, bitmap_test_opaque(bitmap)); + DisposeDTObject(dto); } else return NULL; diff --git a/amiga/gui.c b/amiga/gui.c index ce3967582..d77210541 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2824,7 +2824,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, - SPACE_Transparent, TRUE, + SPACE_Transparent, FALSE, // SPACE_RenderHook, &g->shared->favicon_hook, SpaceEnd, CHILD_WeightedWidth,0, @@ -2850,7 +2850,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GA_ID, GID_SEARCH_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, - SPACE_Transparent, TRUE, + SPACE_Transparent, FALSE, SPACE_RenderHook, &g->shared->search_ico_hook, SpaceEnd, CHILD_WeightedWidth,0, @@ -3830,8 +3830,8 @@ void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) { GetAttr(SPACE_AreaBox, g->shared->objects[GID_ICON], (ULONG *)&bbox); - EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top, - bbox->Left+16, bbox->Top+16); + RefreshGList((struct Gadget *)g->shared->objects[GID_ICON], + g->shared->win, NULL, 1); if(bm) { |