netsurf: branch master updated. release/3.5-193-g313c48b

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Sat Jul 2 14:57:32 BST 2016


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/313c48b8a15b6ebe683ceb8a995c62e2e0e97616
...commit http://git.netsurf-browser.org/netsurf.git/commit/313c48b8a15b6ebe683ceb8a995c62e2e0e97616
...tree http://git.netsurf-browser.org/netsurf.git/tree/313c48b8a15b6ebe683ceb8a995c62e2e0e97616

The branch, master has been updated
       via  313c48b8a15b6ebe683ceb8a995c62e2e0e97616 (commit)
       via  6c8225d3ab17f25aa1e8ed7f22533772c8d98245 (commit)
      from  65175b4362e01a7bf2f373dc100b7fb0ec4cf44c (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=313c48b8a15b6ebe683ceb8a995c62e2e0e97616
commit 313c48b8a15b6ebe683ceb8a995c62e2e0e97616
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Ensure we aren't using a NULL native BitMap anywhere

diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 9e441d8..7b73360 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -504,14 +504,16 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm)
 		icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL);
 		ami_bitmap_set_icondata(bm, icondata);
 
-		BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
-					BLITA_Height, THUMBNAIL_HEIGHT,
-					BLITA_SrcType, BLITT_BITMAP,
-					BLITA_Source, bitmap,
-					BLITA_DestType, BLITT_ARGB32,
-					BLITA_DestBytesPerRow, THUMBNAIL_WIDTH * 4,
-					BLITA_Dest, icondata,
+		if(bitmap) {
+			BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
+						BLITA_Height, THUMBNAIL_HEIGHT,
+						BLITA_SrcType, BLITT_BITMAP,
+						BLITA_Source, bitmap,
+						BLITA_DestType, BLITT_ARGB32,
+						BLITA_DestBytesPerRow, THUMBNAIL_WIDTH * 4,
+						BLITA_Dest, icondata,
 					TAG_DONE);
+		}
 	}
 #endif
 	dobj = GetIconTags(NULL, ICONGETA_GetDefaultType, WBPROJECT,
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index e18ee33..d87bae3 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -455,9 +455,10 @@ void gui_window_stop_throbber(struct gui_window *g)
 			return;
 		}
 
-		BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left,
-			bbox->Top, throbber_width, throbber_height, 0x0C0);
-
+		if(throbber != NULL) {
+			BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left,
+				bbox->Top, throbber_width, throbber_height, 0x0C0);
+		}
 		ami_gui_free_space_box(bbox);
 	}
 
@@ -486,23 +487,26 @@ static void ami_throbber_update(void *p)
 			amiga_warn_user("NoMemory", "");
 			return;
 		}
+
+		if(throbber != NULL) {
 #ifdef __amigaos4__
-		BltBitMapTags(BLITA_SrcX, throbber_width * frame,
-					BLITA_SrcY, 0,
-					BLITA_DestX, bbox->Left,
-					BLITA_DestY, bbox->Top,
-					BLITA_Width, throbber_width,
-					BLITA_Height, throbber_height,
-					BLITA_Source, throbber,
-					BLITA_Dest, g->shared->win->RPort,
-					BLITA_SrcType, BLITT_BITMAP,
-					BLITA_DestType, BLITT_RASTPORT,
-				//	BLITA_UseSrcAlpha, TRUE,
+			BltBitMapTags(BLITA_SrcX, throbber_width * frame,
+						BLITA_SrcY, 0,
+						BLITA_DestX, bbox->Left,
+						BLITA_DestY, bbox->Top,
+						BLITA_Width, throbber_width,
+						BLITA_Height, throbber_height,
+						BLITA_Source, throbber,
+						BLITA_Dest, g->shared->win->RPort,
+						BLITA_SrcType, BLITT_BITMAP,
+						BLITA_DestType, BLITT_RASTPORT,
+					//	BLITA_UseSrcAlpha, TRUE,
 					TAG_DONE);
 #else
-		BltBitMapRastPort(throbber, throbber_width * frame, 0, g->shared->win->RPort,
-			bbox->Left, bbox->Top, throbber_width, throbber_height, 0xC0);
+			BltBitMapRastPort(throbber, throbber_width * frame, 0, g->shared->win->RPort,
+				bbox->Left, bbox->Top, throbber_width, throbber_height, 0xC0);
 #endif
+		}
 		ami_gui_free_space_box(bbox);
 	}
 


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6c8225d3ab17f25aa1e8ed7f22533772c8d98245
commit 6c8225d3ab17f25aa1e8ed7f22533772c8d98245
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Don't abort on startup if GuiGFX is not available
    Most OS4 users won't need it, everybody else might like the opportunity of using NetSurf to download it :)

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index badd374..d6d0c76 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -80,6 +80,7 @@ enum {
 };
 
 static APTR pool_bitmap = NULL;
+static bool guigfx_warned = false;
 
 /* exported function documented in amiga/bitmap.h */
 void *amiga_bitmap_create(int width, int height, unsigned int state)
@@ -416,16 +417,19 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, int w
 
 	if(tbm == NULL) {
 		if(type == AMI_NSBM_TRUECOLOUR) {
-			if((tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32, 0,
-										friendbm, AMI_BITMAP_FORMAT))) {
-				ami_rtg_writepixelarray(amiga_bitmap_get_buffer(bitmap),
+			tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32, 0,
+										friendbm, AMI_BITMAP_FORMAT);
+			if(tbm == NULL) return NULL;
+
+			ami_rtg_writepixelarray(amiga_bitmap_get_buffer(bitmap),
 										tbm, bitmap->width, bitmap->height,
 										bitmap->width * 4, AMI_BITMAP_FORMAT);
-			}
 		} else {
-			if((tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height,
-										8, 0, friendbm, AMI_BITMAP_FORMAT))) {
+			tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height,
+										8, 0, friendbm, AMI_BITMAP_FORMAT);
+			if(tbm == NULL) return NULL;
 
+			if(GuiGFXBase != NULL) {
 				struct RastPort rp;
 				InitRastPort(&rp);
 				rp.BitMap = tbm;
@@ -450,6 +454,11 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, int w
 				DirectDrawTrueColor(ddh, (ULONG *)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
 				DeleteDirectDrawHandle(ddh);
 				ami_bitmap_argb_to_rgba(bitmap);
+			} else {
+				if(guigfx_warned == false) {
+					amiga_warn_user("BMConvErr", NULL);
+					guigfx_warned = true;
+				}
 			}
 		}
 
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index 993cd3a..00facf9 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -227,7 +227,7 @@ bool ami_libs_open(void)
 		AMINS_LIB_OPEN("Picasso96API.library",  0, P96,         "main",        1, false)
 
 	/* Non-OS provided libraries */
-	AMINS_LIB_OPEN("guigfx.library",    9, GuiGFX,   "main",        1, true)
+	AMINS_LIB_OPEN("guigfx.library",    9, GuiGFX,   "main",        1, false)
 
 	/* NB: timer.device is opened in schedule.c (ultimately by the scheduler process).
 	 * The library base and interface are obtained there, rather than here, due to
diff --git a/resources/FatMessages b/resources/FatMessages
index 9a86234..7e08038 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -3314,6 +3314,11 @@ de.ami.CompError:Nicht zu öffnen
 fr.ami.CompError:Unable to open
 it.ami.CompError:Impossibile aprire
 nl.ami.CompError:Niet te openen
+en.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+de.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+fr.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+it.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+nl.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
 en.ami.MultiTabClose:Are you sure you want to close multiple tabs?
 de.ami.MultiTabClose:Are you sure you want to close multiple tabs?
 fr.ami.MultiTabClose:Are you sure you want to close multiple tabs?


-----------------------------------------------------------------------

Summary of changes:
 frontends/amiga/bitmap.c |   21 +++++++++++++++------
 frontends/amiga/icon.c   |   16 +++++++++-------
 frontends/amiga/libs.c   |    2 +-
 frontends/amiga/theme.c  |   36 ++++++++++++++++++++----------------
 resources/FatMessages    |    5 +++++
 5 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index badd374..d6d0c76 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -80,6 +80,7 @@ enum {
 };
 
 static APTR pool_bitmap = NULL;
+static bool guigfx_warned = false;
 
 /* exported function documented in amiga/bitmap.h */
 void *amiga_bitmap_create(int width, int height, unsigned int state)
@@ -416,16 +417,19 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, int w
 
 	if(tbm == NULL) {
 		if(type == AMI_NSBM_TRUECOLOUR) {
-			if((tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32, 0,
-										friendbm, AMI_BITMAP_FORMAT))) {
-				ami_rtg_writepixelarray(amiga_bitmap_get_buffer(bitmap),
+			tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32, 0,
+										friendbm, AMI_BITMAP_FORMAT);
+			if(tbm == NULL) return NULL;
+
+			ami_rtg_writepixelarray(amiga_bitmap_get_buffer(bitmap),
 										tbm, bitmap->width, bitmap->height,
 										bitmap->width * 4, AMI_BITMAP_FORMAT);
-			}
 		} else {
-			if((tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height,
-										8, 0, friendbm, AMI_BITMAP_FORMAT))) {
+			tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height,
+										8, 0, friendbm, AMI_BITMAP_FORMAT);
+			if(tbm == NULL) return NULL;
 
+			if(GuiGFXBase != NULL) {
 				struct RastPort rp;
 				InitRastPort(&rp);
 				rp.BitMap = tbm;
@@ -450,6 +454,11 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, int w
 				DirectDrawTrueColor(ddh, (ULONG *)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
 				DeleteDirectDrawHandle(ddh);
 				ami_bitmap_argb_to_rgba(bitmap);
+			} else {
+				if(guigfx_warned == false) {
+					amiga_warn_user("BMConvErr", NULL);
+					guigfx_warned = true;
+				}
 			}
 		}
 
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 9e441d8..7b73360 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -504,14 +504,16 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm)
 		icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL);
 		ami_bitmap_set_icondata(bm, icondata);
 
-		BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
-					BLITA_Height, THUMBNAIL_HEIGHT,
-					BLITA_SrcType, BLITT_BITMAP,
-					BLITA_Source, bitmap,
-					BLITA_DestType, BLITT_ARGB32,
-					BLITA_DestBytesPerRow, THUMBNAIL_WIDTH * 4,
-					BLITA_Dest, icondata,
+		if(bitmap) {
+			BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
+						BLITA_Height, THUMBNAIL_HEIGHT,
+						BLITA_SrcType, BLITT_BITMAP,
+						BLITA_Source, bitmap,
+						BLITA_DestType, BLITT_ARGB32,
+						BLITA_DestBytesPerRow, THUMBNAIL_WIDTH * 4,
+						BLITA_Dest, icondata,
 					TAG_DONE);
+		}
 	}
 #endif
 	dobj = GetIconTags(NULL, ICONGETA_GetDefaultType, WBPROJECT,
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index 993cd3a..00facf9 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -227,7 +227,7 @@ bool ami_libs_open(void)
 		AMINS_LIB_OPEN("Picasso96API.library",  0, P96,         "main",        1, false)
 
 	/* Non-OS provided libraries */
-	AMINS_LIB_OPEN("guigfx.library",    9, GuiGFX,   "main",        1, true)
+	AMINS_LIB_OPEN("guigfx.library",    9, GuiGFX,   "main",        1, false)
 
 	/* NB: timer.device is opened in schedule.c (ultimately by the scheduler process).
 	 * The library base and interface are obtained there, rather than here, due to
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index e18ee33..d87bae3 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -455,9 +455,10 @@ void gui_window_stop_throbber(struct gui_window *g)
 			return;
 		}
 
-		BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left,
-			bbox->Top, throbber_width, throbber_height, 0x0C0);
-
+		if(throbber != NULL) {
+			BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left,
+				bbox->Top, throbber_width, throbber_height, 0x0C0);
+		}
 		ami_gui_free_space_box(bbox);
 	}
 
@@ -486,23 +487,26 @@ static void ami_throbber_update(void *p)
 			amiga_warn_user("NoMemory", "");
 			return;
 		}
+
+		if(throbber != NULL) {
 #ifdef __amigaos4__
-		BltBitMapTags(BLITA_SrcX, throbber_width * frame,
-					BLITA_SrcY, 0,
-					BLITA_DestX, bbox->Left,
-					BLITA_DestY, bbox->Top,
-					BLITA_Width, throbber_width,
-					BLITA_Height, throbber_height,
-					BLITA_Source, throbber,
-					BLITA_Dest, g->shared->win->RPort,
-					BLITA_SrcType, BLITT_BITMAP,
-					BLITA_DestType, BLITT_RASTPORT,
-				//	BLITA_UseSrcAlpha, TRUE,
+			BltBitMapTags(BLITA_SrcX, throbber_width * frame,
+						BLITA_SrcY, 0,
+						BLITA_DestX, bbox->Left,
+						BLITA_DestY, bbox->Top,
+						BLITA_Width, throbber_width,
+						BLITA_Height, throbber_height,
+						BLITA_Source, throbber,
+						BLITA_Dest, g->shared->win->RPort,
+						BLITA_SrcType, BLITT_BITMAP,
+						BLITA_DestType, BLITT_RASTPORT,
+					//	BLITA_UseSrcAlpha, TRUE,
 					TAG_DONE);
 #else
-		BltBitMapRastPort(throbber, throbber_width * frame, 0, g->shared->win->RPort,
-			bbox->Left, bbox->Top, throbber_width, throbber_height, 0xC0);
+			BltBitMapRastPort(throbber, throbber_width * frame, 0, g->shared->win->RPort,
+				bbox->Left, bbox->Top, throbber_width, throbber_height, 0xC0);
 #endif
+		}
 		ami_gui_free_space_box(bbox);
 	}
 
diff --git a/resources/FatMessages b/resources/FatMessages
index 9a86234..7e08038 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -3314,6 +3314,11 @@ de.ami.CompError:Nicht zu öffnen
 fr.ami.CompError:Unable to open
 it.ami.CompError:Impossibile aprire
 nl.ami.CompError:Niet te openen
+en.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+de.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+fr.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+it.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
+nl.ami.BMConvErr:NetSurf requires guigfx.library to display images in this mode
 en.ami.MultiTabClose:Are you sure you want to close multiple tabs?
 de.ami.MultiTabClose:Are you sure you want to close multiple tabs?
 fr.ami.MultiTabClose:Are you sure you want to close multiple tabs?


-- 
NetSurf Browser



More information about the netsurf-commits mailing list