netsurf: branch master updated. release/3.0-157-g22ce03a

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Thu May 30 00:04:45 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/22ce03aed6e011a53a8adbbbf2cf4df798d8cc45
...commit http://git.netsurf-browser.org/netsurf.git/commit/22ce03aed6e011a53a8adbbbf2cf4df798d8cc45
...tree http://git.netsurf-browser.org/netsurf.git/tree/22ce03aed6e011a53a8adbbbf2cf4df798d8cc45

The branch, master has been updated
       via  22ce03aed6e011a53a8adbbbf2cf4df798d8cc45 (commit)
      from  817e85f8823f6847b49c39622b6d62ac86871391 (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=22ce03aed6e011a53a8adbbbf2cf4df798d8cc45
commit 22ce03aed6e011a53a8adbbbf2cf4df798d8cc45
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Tentatively replace colour conversion with core macro

diff --git a/amiga/plotters.c b/amiga/plotters.c
index c8a5c20..a4ddb61 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -22,6 +22,7 @@
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
 
+#include "css/utils.h"
 #include "utils/nsoption.h"
 #include "utils/utils.h"
 #include "utils/log.h"
@@ -102,15 +103,7 @@ const struct plotter_table amiplot = {
 };
 
 colour ami_abgr_to_argb(colour c) {
-	colour argb = 0x00000000;
-
-	/* NB: We force the alpha byte to be 0xff, as it is not set by the core. */
-	argb = 0xff000000 |
-		((c & 0x00ff0000) >> 16) |
-		(c & 0x0000ff00) |
-		((c & 0x000000ff) << 16);
-
-	return argb;
+	return ns_color_to_nscss(c);
 }
 
 #ifdef NS_AMIGA_CAIRO


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

Summary of changes:
 amiga/plotters.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/amiga/plotters.c b/amiga/plotters.c
index c8a5c20..a4ddb61 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -22,6 +22,7 @@
 #include "amiga/gui.h"
 #include "amiga/utf8.h"
 
+#include "css/utils.h"
 #include "utils/nsoption.h"
 #include "utils/utils.h"
 #include "utils/log.h"
@@ -102,15 +103,7 @@ const struct plotter_table amiplot = {
 };
 
 colour ami_abgr_to_argb(colour c) {
-	colour argb = 0x00000000;
-
-	/* NB: We force the alpha byte to be 0xff, as it is not set by the core. */
-	argb = 0xff000000 |
-		((c & 0x00ff0000) >> 16) |
-		(c & 0x0000ff00) |
-		((c & 0x000000ff) << 16);
-
-	return argb;
+	return ns_color_to_nscss(c);
 }
 
 #ifdef NS_AMIGA_CAIRO


-- 
NetSurf Browser



More information about the netsurf-commits mailing list