netsurf: branch master updated. release/3.3-623-g9e5bf6f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9e5bf6fb6869ebfe66e5e...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9e5bf6fb6869ebfe66e5ec8...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9e5bf6fb6869ebfe66e5ec84d...
The branch, master has been updated
via 9e5bf6fb6869ebfe66e5ec84de4d9c55330bcc93 (commit)
from 4b0ebae56a402b27a2c2cd3e7d065b733f0004bc (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=9e5bf6fb6869ebfe66e...
commit 9e5bf6fb6869ebfe66e5ec84de4d9c55330bcc93
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't free the deferred rects using FreeVec on exit as they're itempools
diff --git a/amiga/misc.c b/amiga/misc.c
index 97e9f9f..ea888e0 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -80,9 +80,9 @@ APTR ami_misc_itempool_alloc(APTR pool, int size)
void ami_misc_itempool_free(APTR pool, APTR item, int size)
{
#ifdef __amigaos4__
- return ItemPoolFree(pool, item);
+ ItemPoolFree(pool, item);
#else
- return FreePooled(pool, item, size);
+ FreePooled(pool, item, size);
#endif
}
diff --git a/amiga/object.c b/amiga/object.c
index aab66bb..6fedb97 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -124,7 +124,11 @@ void FreeObjList(struct MinList *objlist)
do {
nnode=(struct nsObject *)GetSucc((struct Node *)node);
- DelObject(node);
+ if(node->Type == AMINS_RECT) {
+ DelObjectNoFree(node);
+ } else {
+ DelObject(node);
+ }
} while((node=nnode));
FreeVec(objlist);
-----------------------------------------------------------------------
Summary of changes:
amiga/misc.c | 4 ++--
amiga/object.c | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/amiga/misc.c b/amiga/misc.c
index 97e9f9f..ea888e0 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -80,9 +80,9 @@ APTR ami_misc_itempool_alloc(APTR pool, int size)
void ami_misc_itempool_free(APTR pool, APTR item, int size)
{
#ifdef __amigaos4__
- return ItemPoolFree(pool, item);
+ ItemPoolFree(pool, item);
#else
- return FreePooled(pool, item, size);
+ FreePooled(pool, item, size);
#endif
}
diff --git a/amiga/object.c b/amiga/object.c
index aab66bb..6fedb97 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -124,7 +124,11 @@ void FreeObjList(struct MinList *objlist)
do {
nnode=(struct nsObject *)GetSucc((struct Node *)node);
- DelObject(node);
+ if(node->Type == AMINS_RECT) {
+ DelObjectNoFree(node);
+ } else {
+ DelObject(node);
+ }
} while((node=nnode));
FreeVec(objlist);
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-622-g4b0ebae
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/4b0ebae56a402b27a2c2c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/4b0ebae56a402b27a2c2cd3...
...tree http://git.netsurf-browser.org/netsurf.git/tree/4b0ebae56a402b27a2c2cd3e7...
The branch, master has been updated
via 4b0ebae56a402b27a2c2cd3e7d065b733f0004bc (commit)
from 5b422a3ec9b8ceaa9107374f1be3439f23baf0df (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=4b0ebae56a402b27a2c...
commit 4b0ebae56a402b27a2c2cd3e7d065b733f0004bc
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add a couple of general JS tests.
The primes one prints its execution time:
NetSurf without -v: 1300ish
with -v: 5000ish
Firefox 38.5.0: 300ish
diff --git a/test/js/index.html b/test/js/index.html
index f5420ed..79f5bbc 100644
--- a/test/js/index.html
+++ b/test/js/index.html
@@ -6,6 +6,12 @@
<body>
<h1>JavaScript Tests</h1>
+<h2>General</h2>
+<ul>
+<li><a href="js-fractal.html">Fractal</a></li>
+<li><a href="js-primes.html">Primes</a></li>
+</ul>
+
<h2>Core</h2>
<ul>
<li><a href="core.recursion.html">Infinite Recursion</a></li>
diff --git a/test/js/js-fractal.html b/test/js/js-fractal.html
new file mode 100644
index 0000000..d9947e3
--- /dev/null
+++ b/test/js/js-fractal.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>JavaScript mandelbrot set</title>
+<style>pre {font-size:8pt;}</style>
+</head>
+<body>
+<h1>JavaScript generated mandelbrot set</h1>
+<script>
+function show_mandelbrot()
+{
+ var gradation = " .,:;=|i+IhHOE#$ ";
+ document.writeln("<pre>");
+ for(i = -1.2; i <= 1.2; i += 0.04) {
+ for(r = -2; r <= 1; r += 0.02) {
+ var zr = r;
+ var zi = i;
+ var n = 0;
+ for(; n < 16; n++) {
+ var zr2 = zr * zr;
+ var zi2 = zi * zi;
+ if((zr2 + zi2) > 4) {
+ break;
+ }
+ zi = 2 * zr * zi + i;
+ zr = zr2 - zi2 + r;
+ }
+ document.write(gradation.charAt(n));
+ }
+ document.write("\n");
+ }
+ document.writeln("</pre>");
+ document.close();
+}
+show_mandelbrot();
+</script>
+<noscript>
+JavaScript not enabled.
+</noscript>
+</body>
+</html>
diff --git a/test/js/js-primes.html b/test/js/js-primes.html
new file mode 100644
index 0000000..876694a
--- /dev/null
+++ b/test/js/js-primes.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>How many bit-reversed primes are prime?</title>
+</head>
+<body>
+<pre>
+<script>
+var start = new Date().getTime();
+
+// Add the lpad method to Strings, for adding left padding
+String.prototype.lpad = function(padString, length) {
+ var str = this;
+ while (str.length < length)
+ str = padString + str;
+ return str;
+}
+
+// Naive prime checker
+function is_prime(n)
+{
+ for (var i = 2; i <= n/2; i++) {
+ if (n % i === 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
+// Bit reversal
+function bit_reverse(num)
+{
+ var rev = 0;
+ while (num > 0) {
+ rev <<= 1;
+ rev |= (num & 1);
+ num >>= 1;
+ }
+ return rev;
+}
+
+for (var num = 1; num < 10000; num++) {
+ var rev = bit_reverse(num);
+ var num_prime = is_prime(num);
+ var rev_prime = is_prime(rev);
+
+ document.write(num.toString().lpad(" ", 7) + " ");
+ document.write(num_prime ? "Prime" : " ");
+ document.write(" ");
+
+ document.write(rev.toString().lpad(" ", 7) + " ");
+ document.write(rev_prime ? "Prime" : " ");
+ document.write(" ");
+
+ document.write(num_prime && rev_prime ? "(both)" : "");
+ document.write("\n");
+}
+
+var end = new Date().getTime();
+var time = end - start;
+document.write('Execution time: ' + time + '\n');
+
+</script>
+</pre>
+</body>
+</html>
-----------------------------------------------------------------------
Summary of changes:
test/js/index.html | 6 +++++
test/js/js-fractal.html | 41 +++++++++++++++++++++++++++++
test/js/js-primes.html | 66 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 113 insertions(+)
create mode 100644 test/js/js-fractal.html
create mode 100644 test/js/js-primes.html
diff --git a/test/js/index.html b/test/js/index.html
index f5420ed..79f5bbc 100644
--- a/test/js/index.html
+++ b/test/js/index.html
@@ -6,6 +6,12 @@
<body>
<h1>JavaScript Tests</h1>
+<h2>General</h2>
+<ul>
+<li><a href="js-fractal.html">Fractal</a></li>
+<li><a href="js-primes.html">Primes</a></li>
+</ul>
+
<h2>Core</h2>
<ul>
<li><a href="core.recursion.html">Infinite Recursion</a></li>
diff --git a/test/js/js-fractal.html b/test/js/js-fractal.html
new file mode 100644
index 0000000..d9947e3
--- /dev/null
+++ b/test/js/js-fractal.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>JavaScript mandelbrot set</title>
+<style>pre {font-size:8pt;}</style>
+</head>
+<body>
+<h1>JavaScript generated mandelbrot set</h1>
+<script>
+function show_mandelbrot()
+{
+ var gradation = " .,:;=|i+IhHOE#$ ";
+ document.writeln("<pre>");
+ for(i = -1.2; i <= 1.2; i += 0.04) {
+ for(r = -2; r <= 1; r += 0.02) {
+ var zr = r;
+ var zi = i;
+ var n = 0;
+ for(; n < 16; n++) {
+ var zr2 = zr * zr;
+ var zi2 = zi * zi;
+ if((zr2 + zi2) > 4) {
+ break;
+ }
+ zi = 2 * zr * zi + i;
+ zr = zr2 - zi2 + r;
+ }
+ document.write(gradation.charAt(n));
+ }
+ document.write("\n");
+ }
+ document.writeln("</pre>");
+ document.close();
+}
+show_mandelbrot();
+</script>
+<noscript>
+JavaScript not enabled.
+</noscript>
+</body>
+</html>
diff --git a/test/js/js-primes.html b/test/js/js-primes.html
new file mode 100644
index 0000000..876694a
--- /dev/null
+++ b/test/js/js-primes.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>How many bit-reversed primes are prime?</title>
+</head>
+<body>
+<pre>
+<script>
+var start = new Date().getTime();
+
+// Add the lpad method to Strings, for adding left padding
+String.prototype.lpad = function(padString, length) {
+ var str = this;
+ while (str.length < length)
+ str = padString + str;
+ return str;
+}
+
+// Naive prime checker
+function is_prime(n)
+{
+ for (var i = 2; i <= n/2; i++) {
+ if (n % i === 0) {
+ return false;
+ }
+ }
+ return true;
+}
+
+// Bit reversal
+function bit_reverse(num)
+{
+ var rev = 0;
+ while (num > 0) {
+ rev <<= 1;
+ rev |= (num & 1);
+ num >>= 1;
+ }
+ return rev;
+}
+
+for (var num = 1; num < 10000; num++) {
+ var rev = bit_reverse(num);
+ var num_prime = is_prime(num);
+ var rev_prime = is_prime(rev);
+
+ document.write(num.toString().lpad(" ", 7) + " ");
+ document.write(num_prime ? "Prime" : " ");
+ document.write(" ");
+
+ document.write(rev.toString().lpad(" ", 7) + " ");
+ document.write(rev_prime ? "Prime" : " ");
+ document.write(" ");
+
+ document.write(num_prime && rev_prime ? "(both)" : "");
+ document.write("\n");
+}
+
+var end = new Date().getTime();
+var time = end - start;
+document.write('Execution time: ' + time + '\n');
+
+</script>
+</pre>
+</body>
+</html>
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-621-g5b422a3
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/5b422a3ec9b8ceaa91073...
...commit http://git.netsurf-browser.org/netsurf.git/commit/5b422a3ec9b8ceaa9107374...
...tree http://git.netsurf-browser.org/netsurf.git/tree/5b422a3ec9b8ceaa9107374f1...
The branch, master has been updated
via 5b422a3ec9b8ceaa9107374f1be3439f23baf0df (commit)
from 7e7ea09000c9386dfa4db75be3ea6c49ab203cfd (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=5b422a3ec9b8ceaa910...
commit 5b422a3ec9b8ceaa9107374f1be3439f23baf0df
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix opening of SSL cert window
diff --git a/amiga/tree.c b/amiga/tree.c
index e4f7eb3..8a35a44 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -764,7 +764,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_ParentGroup, twin->objects[GID_MAIN] = LayoutVObj,
- LAYOUT_AddImage, LabelObject,
+ LAYOUT_AddImage, LabelObj,
LABEL_Text, twin->sslerr,
LabelEnd,
LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObj,
@@ -772,7 +772,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
SPACE_Transparent,TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
SpaceEnd,
- LAYOUT_AddChild, HGroupObject,
+ LAYOUT_AddChild, LayoutHObj,
LAYOUT_AddChild, twin->objects[GID_OPEN] = ButtonObj,
GA_ID,GID_OPEN,
GA_Text, twin->sslaccept,
-----------------------------------------------------------------------
Summary of changes:
amiga/tree.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amiga/tree.c b/amiga/tree.c
index e4f7eb3..8a35a44 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -764,7 +764,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_ParentGroup, twin->objects[GID_MAIN] = LayoutVObj,
- LAYOUT_AddImage, LabelObject,
+ LAYOUT_AddImage, LabelObj,
LABEL_Text, twin->sslerr,
LabelEnd,
LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObj,
@@ -772,7 +772,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
SPACE_Transparent,TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
SpaceEnd,
- LAYOUT_AddChild, HGroupObject,
+ LAYOUT_AddChild, LayoutHObj,
LAYOUT_AddChild, twin->objects[GID_OPEN] = ButtonObj,
GA_ID,GID_OPEN,
GA_Text, twin->sslaccept,
--
NetSurf Browser
7 years, 8 months
libdom: branch master updated. release/0.2.0-4-g4102741
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libdom.git/shortlog/410274173d434e34a5eb08...
...commit http://git.netsurf-browser.org/libdom.git/commit/410274173d434e34a5eb085d...
...tree http://git.netsurf-browser.org/libdom.git/tree/410274173d434e34a5eb085d13...
The branch, master has been updated
via 410274173d434e34a5eb085d13228d68cd44d509 (commit)
from 418da4cef720b72bfee797d584933ed689f2e74a (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/libdom.git/commit/?id=410274173d434e34a5eb...
commit 410274173d434e34a5eb085d13228d68cd44d509
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Unref document uri on finalisation.
diff --git a/src/core/document.c b/src/core/document.c
index fda83dd..14fd1b9 100644
--- a/src/core/document.c
+++ b/src/core/document.c
@@ -319,6 +319,7 @@ bool _dom_document_finalise(dom_document *doc)
if (doc->id_name != NULL)
dom_string_unref(doc->id_name);
+ dom_string_unref(doc->uri);
dom_string_unref(doc->class_string);
dom_string_unref(doc->script_string);
dom_string_unref(doc->_memo_empty);
-----------------------------------------------------------------------
Summary of changes:
src/core/document.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/document.c b/src/core/document.c
index fda83dd..14fd1b9 100644
--- a/src/core/document.c
+++ b/src/core/document.c
@@ -319,6 +319,7 @@ bool _dom_document_finalise(dom_document *doc)
if (doc->id_name != NULL)
dom_string_unref(doc->id_name);
+ dom_string_unref(doc->uri);
dom_string_unref(doc->class_string);
dom_string_unref(doc->script_string);
dom_string_unref(doc->_memo_empty);
--
Document Object Model library
7 years, 8 months
netsurf: branch master updated. release/3.3-620-g7e7ea09
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/7e7ea09000c9386dfa4db...
...commit http://git.netsurf-browser.org/netsurf.git/commit/7e7ea09000c9386dfa4db75...
...tree http://git.netsurf-browser.org/netsurf.git/tree/7e7ea09000c9386dfa4db75be...
The branch, master has been updated
via 7e7ea09000c9386dfa4db75be3ea6c49ab203cfd (commit)
from c2bd86ca9644734ad87b560757251e26fde666b7 (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=7e7ea09000c9386dfa4...
commit 7e7ea09000c9386dfa4db75be3ea6c49ab203cfd
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Allocate generic list objects using itempools
TODO: Allocate the attached structures also using itempools
diff --git a/amiga/gui.c b/amiga/gui.c
index 58e7938..2521acb 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3049,6 +3049,8 @@ static void gui_quit(void)
FreeVec(current_user_faviconcache);
FreeVec(current_user);
+ ami_object_fini();
+
ami_libs_close();
}
@@ -5497,6 +5499,8 @@ int main(int argc, char** argv)
/* Open splash window */
Object *splash_window = ami_gui_splash_open();
+ ami_object_init();
+
if (ami_open_resources() == false) { /* alloc message ports */
ami_misc_fatal_error("Unable to allocate resources");
ami_gui_splash_close(splash_window);
diff --git a/amiga/misc.c b/amiga/misc.c
index 9100120..97e9f9f 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -52,10 +52,10 @@ APTR ami_misc_itempool_create(int size)
ASOITEM_MFlags, MEMF_PRIVATE,
ASOITEM_ItemSize, size,
ASOITEM_GCPolicy, ITEMGC_AFTERCOUNT,
- ASOITEM_GCParameter, 50,
+ ASOITEM_GCParameter, 100,
TAG_DONE);
#else
- return CreatePool(MEMF_ANY, 2 * size, size);
+ return CreatePool(MEMF_ANY, 20 * size, size);
#endif
}
diff --git a/amiga/object.c b/amiga/object.c
index 7d93594..aab66bb 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005,2008 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ * Copyright 2005, 2008, 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -18,7 +18,9 @@
#include "amiga/os3support.h"
+#include <stdbool.h>
#include <stdlib.h>
+#include <string.h>
#include <proto/exec.h>
#include <exec/lists.h>
@@ -35,6 +37,21 @@
#define NewnsList NewList
#endif
+APTR pool_nsobj = NULL;
+
+bool ami_object_init(void)
+{
+ pool_nsobj = ami_misc_itempool_create(sizeof(struct nsObject));
+
+ if(pool_nsobj == NULL) return false;
+ else return true;
+}
+
+void ami_object_fini(void)
+{
+ ami_misc_itempool_delete(pool_nsobj);
+}
+
/* Slightly abstract MinList initialisation */
void ami_NewMinList(struct MinList *list)
{
@@ -61,8 +78,10 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype)
{
struct nsObject *dtzo;
- dtzo = (struct nsObject *)ami_misc_allocvec_clear(sizeof(struct nsObject), 0);
+ dtzo = (struct nsObject *)ami_misc_itempool_alloc(pool_nsobj, sizeof(struct nsObject));
+ if(dtzo == NULL) return NULL;
+ memset(dtzo, 0, sizeof(struct nsObject));
AddTail((struct List *)objlist,(struct Node *)dtzo);
dtzo->Type = otype;
@@ -81,7 +100,7 @@ static void DelObjectInternal(struct nsObject *dtzo, BOOL free_obj)
if(dtzo->callback != NULL) dtzo->callback(dtzo->objstruct);
if(dtzo->objstruct && free_obj) FreeVec(dtzo->objstruct);
if(dtzo->dtz_Node.ln_Name) free(dtzo->dtz_Node.ln_Name);
- FreeVec(dtzo);
+ ami_misc_itempool_free(pool_nsobj, dtzo, sizeof(struct nsObject));
dtzo = NULL;
}
@@ -110,3 +129,4 @@ void FreeObjList(struct MinList *objlist)
FreeVec(objlist);
}
+
diff --git a/amiga/object.h b/amiga/object.h
index 85cbb6d..6ea9bd1 100755
--- a/amiga/object.h
+++ b/amiga/object.h
@@ -58,5 +58,9 @@ void FreeObjList(struct MinList *objlist);
/** List abstraction as OS3 appears to have problems with NewMinList() **/
struct MinList *ami_AllocMinList(void);
void ami_NewMinList(struct MinList *list);
+
+/** Initialisation for itempool **/
+bool ami_object_init(void);
+void ami_object_fini(void);
#endif
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++++
amiga/misc.c | 4 ++--
amiga/object.c | 26 +++++++++++++++++++++++---
amiga/object.h | 4 ++++
4 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index 58e7938..2521acb 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3049,6 +3049,8 @@ static void gui_quit(void)
FreeVec(current_user_faviconcache);
FreeVec(current_user);
+ ami_object_fini();
+
ami_libs_close();
}
@@ -5497,6 +5499,8 @@ int main(int argc, char** argv)
/* Open splash window */
Object *splash_window = ami_gui_splash_open();
+ ami_object_init();
+
if (ami_open_resources() == false) { /* alloc message ports */
ami_misc_fatal_error("Unable to allocate resources");
ami_gui_splash_close(splash_window);
diff --git a/amiga/misc.c b/amiga/misc.c
index 9100120..97e9f9f 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -52,10 +52,10 @@ APTR ami_misc_itempool_create(int size)
ASOITEM_MFlags, MEMF_PRIVATE,
ASOITEM_ItemSize, size,
ASOITEM_GCPolicy, ITEMGC_AFTERCOUNT,
- ASOITEM_GCParameter, 50,
+ ASOITEM_GCParameter, 100,
TAG_DONE);
#else
- return CreatePool(MEMF_ANY, 2 * size, size);
+ return CreatePool(MEMF_ANY, 20 * size, size);
#endif
}
diff --git a/amiga/object.c b/amiga/object.c
index 7d93594..aab66bb 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005,2008 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ * Copyright 2005, 2008, 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -18,7 +18,9 @@
#include "amiga/os3support.h"
+#include <stdbool.h>
#include <stdlib.h>
+#include <string.h>
#include <proto/exec.h>
#include <exec/lists.h>
@@ -35,6 +37,21 @@
#define NewnsList NewList
#endif
+APTR pool_nsobj = NULL;
+
+bool ami_object_init(void)
+{
+ pool_nsobj = ami_misc_itempool_create(sizeof(struct nsObject));
+
+ if(pool_nsobj == NULL) return false;
+ else return true;
+}
+
+void ami_object_fini(void)
+{
+ ami_misc_itempool_delete(pool_nsobj);
+}
+
/* Slightly abstract MinList initialisation */
void ami_NewMinList(struct MinList *list)
{
@@ -61,8 +78,10 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype)
{
struct nsObject *dtzo;
- dtzo = (struct nsObject *)ami_misc_allocvec_clear(sizeof(struct nsObject), 0);
+ dtzo = (struct nsObject *)ami_misc_itempool_alloc(pool_nsobj, sizeof(struct nsObject));
+ if(dtzo == NULL) return NULL;
+ memset(dtzo, 0, sizeof(struct nsObject));
AddTail((struct List *)objlist,(struct Node *)dtzo);
dtzo->Type = otype;
@@ -81,7 +100,7 @@ static void DelObjectInternal(struct nsObject *dtzo, BOOL free_obj)
if(dtzo->callback != NULL) dtzo->callback(dtzo->objstruct);
if(dtzo->objstruct && free_obj) FreeVec(dtzo->objstruct);
if(dtzo->dtz_Node.ln_Name) free(dtzo->dtz_Node.ln_Name);
- FreeVec(dtzo);
+ ami_misc_itempool_free(pool_nsobj, dtzo, sizeof(struct nsObject));
dtzo = NULL;
}
@@ -110,3 +129,4 @@ void FreeObjList(struct MinList *objlist)
FreeVec(objlist);
}
+
diff --git a/amiga/object.h b/amiga/object.h
index 85cbb6d..6ea9bd1 100755
--- a/amiga/object.h
+++ b/amiga/object.h
@@ -58,5 +58,9 @@ void FreeObjList(struct MinList *objlist);
/** List abstraction as OS3 appears to have problems with NewMinList() **/
struct MinList *ami_AllocMinList(void);
void ami_NewMinList(struct MinList *list);
+
+/** Initialisation for itempool **/
+bool ami_object_init(void);
+void ami_object_fini(void);
#endif
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-619-gc2bd86c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c2bd86ca9644734ad87b5...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c2bd86ca9644734ad87b560...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c2bd86ca9644734ad87b56075...
The branch, master has been updated
via c2bd86ca9644734ad87b560757251e26fde666b7 (commit)
from f51b7780e3eb44d5aa549f9bd77d3c2531323324 (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=c2bd86ca9644734ad87...
commit c2bd86ca9644734ad87b560757251e26fde666b7
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix atari mint duktape build
diff --git a/javascript/duktape/duk_config.h b/javascript/duktape/duk_config.h
index 64c10ea..18cd940 100644
--- a/javascript/duktape/duk_config.h
+++ b/javascript/duktape/duk_config.h
@@ -95,6 +95,11 @@
#define DUK_F_BSD
#endif
+/* Atari Mint */
+#if defined(__MINT__)
+#define DUK_F_MINT
+#endif
+
/* Atari ST TOS. __TOS__ defined by PureC. No platform define in VBCC
* apparently, so to use with VBCC user must define __TOS__ manually.
*/
@@ -2091,6 +2096,8 @@ typedef FILE duk_file;
/* uclibc may be missing these */
#elif defined(DUK_F_AMIGAOS) && defined(DUK_F_VBCC)
/* vbcc + AmigaOS may be missing these */
+#elif defined(DUK_F_MINT)
+/* mint clib is missing these*/
#elif !defined(DUK_F_C99) && !defined(DUK_F_CPP11)
/* build is not C99 or C++11, play it safe */
#else
-----------------------------------------------------------------------
Summary of changes:
javascript/duktape/duk_config.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/javascript/duktape/duk_config.h b/javascript/duktape/duk_config.h
index 64c10ea..18cd940 100644
--- a/javascript/duktape/duk_config.h
+++ b/javascript/duktape/duk_config.h
@@ -95,6 +95,11 @@
#define DUK_F_BSD
#endif
+/* Atari Mint */
+#if defined(__MINT__)
+#define DUK_F_MINT
+#endif
+
/* Atari ST TOS. __TOS__ defined by PureC. No platform define in VBCC
* apparently, so to use with VBCC user must define __TOS__ manually.
*/
@@ -2091,6 +2096,8 @@ typedef FILE duk_file;
/* uclibc may be missing these */
#elif defined(DUK_F_AMIGAOS) && defined(DUK_F_VBCC)
/* vbcc + AmigaOS may be missing these */
+#elif defined(DUK_F_MINT)
+/* mint clib is missing these*/
#elif !defined(DUK_F_C99) && !defined(DUK_F_CPP11)
/* build is not C99 or C++11, play it safe */
#else
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-618-gf51b778
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/f51b7780e3eb44d5aa549...
...commit http://git.netsurf-browser.org/netsurf.git/commit/f51b7780e3eb44d5aa549f9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/f51b7780e3eb44d5aa549f9bd...
The branch, master has been updated
via f51b7780e3eb44d5aa549f9bd77d3c2531323324 (commit)
from b29bd8527470dc4f71bb6de512ac8548948caec5 (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=f51b7780e3eb44d5aa5...
commit f51b7780e3eb44d5aa549f9bd77d3c2531323324
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't clear memory twice under OS3
diff --git a/amiga/misc.c b/amiga/misc.c
index 065909e..9100120 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -39,10 +39,8 @@ void *ami_misc_allocvec_clear(int size, UBYTE value)
#ifdef __amigaos4__
return AllocVecTags(size, AVT_ClearWithValue, value, TAG_DONE);
#else
- void *mem = AllocVec(size, MEMF_CLEAR | MEMF_ANY);
- if (mem && (value != 0)) {
- memset(mem, value, size);
- }
+ void *mem = AllocVec(size, MEMF_ANY);
+ if (mem) memset(mem, value, size);
return mem;
#endif
}
-----------------------------------------------------------------------
Summary of changes:
amiga/misc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/amiga/misc.c b/amiga/misc.c
index 065909e..9100120 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -39,10 +39,8 @@ void *ami_misc_allocvec_clear(int size, UBYTE value)
#ifdef __amigaos4__
return AllocVecTags(size, AVT_ClearWithValue, value, TAG_DONE);
#else
- void *mem = AllocVec(size, MEMF_CLEAR | MEMF_ANY);
- if (mem && (value != 0)) {
- memset(mem, value, size);
- }
+ void *mem = AllocVec(size, MEMF_ANY);
+ if (mem) memset(mem, value, size);
return mem;
#endif
}
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-617-gb29bd85
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b29bd8527470dc4f71bb6...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b29bd8527470dc4f71bb6de...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b29bd8527470dc4f71bb6de51...
The branch, master has been updated
via b29bd8527470dc4f71bb6de512ac8548948caec5 (commit)
from 5a58e844e43b397b3154d5635859fe1d78c27877 (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=b29bd8527470dc4f71b...
commit b29bd8527470dc4f71bb6de512ac8548948caec5
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Disable JavaScript force-on for forthcoming release.
diff --git a/javascript/duktape/dukky.c b/javascript/duktape/dukky.c
index f1f62d4..437a3d4 100644
--- a/javascript/duktape/dukky.c
+++ b/javascript/duktape/dukky.c
@@ -337,7 +337,9 @@ void js_initialise(void)
/** TODO: Forces JS on for our testing, needs changing before a release
* lest we incur the wrath of others.
*/
- nsoption_set_bool(enable_javascript, true);
+ /* Disabled force-on for forthcoming release */
+ /* nsoption_set_bool(enable_javascript, true);
+ */
javascript_init();
}
-----------------------------------------------------------------------
Summary of changes:
javascript/duktape/dukky.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/javascript/duktape/dukky.c b/javascript/duktape/dukky.c
index f1f62d4..437a3d4 100644
--- a/javascript/duktape/dukky.c
+++ b/javascript/duktape/dukky.c
@@ -337,7 +337,9 @@ void js_initialise(void)
/** TODO: Forces JS on for our testing, needs changing before a release
* lest we incur the wrath of others.
*/
- nsoption_set_bool(enable_javascript, true);
+ /* Disabled force-on for forthcoming release */
+ /* nsoption_set_bool(enable_javascript, true);
+ */
javascript_init();
}
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-616-g5a58e84
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/5a58e844e43b397b3154d...
...commit http://git.netsurf-browser.org/netsurf.git/commit/5a58e844e43b397b3154d56...
...tree http://git.netsurf-browser.org/netsurf.git/tree/5a58e844e43b397b3154d5635...
The branch, master has been updated
via 5a58e844e43b397b3154d5635859fe1d78c27877 (commit)
from b41685208f25a906b8a08809e67c2a1a2ec153d9 (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=5a58e844e43b397b315...
commit 5a58e844e43b397b3154d5635859fe1d78c27877
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't clear bitmap structure on allocation
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 6984d3e..cc71ccd 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -49,16 +49,21 @@ void *amiga_bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
- bitmap = ami_misc_allocvec_clear(sizeof(struct bitmap), 0);
- if(bitmap)
- {
- bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
- bitmap->width = width;
- bitmap->height = height;
+ bitmap = AllocVecTagList(sizeof(struct bitmap), NULL);
+ if(bitmap == NULL) return NULL;
- if(state & BITMAP_OPAQUE) bitmap->opaque = true;
- else bitmap->opaque = false;
- }
+ bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
+ bitmap->width = width;
+ bitmap->height = height;
+
+ if(state & BITMAP_OPAQUE) bitmap->opaque = true;
+ else bitmap->opaque = false;
+
+ bitmap->nativebm = NULL;
+ bitmap->nativebmwidth = 0;
+ bitmap->nativebmheight = 0;
+ bitmap->native_mask = NULL;
+ bitmap->dto = NULL;
return bitmap;
}
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 6984d3e..cc71ccd 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -49,16 +49,21 @@ void *amiga_bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
- bitmap = ami_misc_allocvec_clear(sizeof(struct bitmap), 0);
- if(bitmap)
- {
- bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
- bitmap->width = width;
- bitmap->height = height;
+ bitmap = AllocVecTagList(sizeof(struct bitmap), NULL);
+ if(bitmap == NULL) return NULL;
- if(state & BITMAP_OPAQUE) bitmap->opaque = true;
- else bitmap->opaque = false;
- }
+ bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
+ bitmap->width = width;
+ bitmap->height = height;
+
+ if(state & BITMAP_OPAQUE) bitmap->opaque = true;
+ else bitmap->opaque = false;
+
+ bitmap->nativebm = NULL;
+ bitmap->nativebmwidth = 0;
+ bitmap->nativebmheight = 0;
+ bitmap->native_mask = NULL;
+ bitmap->dto = NULL;
return bitmap;
}
--
NetSurf Browser
7 years, 8 months
netsurf: branch master updated. release/3.3-615-gb416852
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b41685208f25a906b8a08...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b41685208f25a906b8a0880...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b41685208f25a906b8a08809e...
The branch, master has been updated
via b41685208f25a906b8a08809e67c2a1a2ec153d9 (commit)
from 0cc19b10fcd9f43bb4c9d83654d2d07cad139b12 (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=b41685208f25a906b8a...
commit b41685208f25a906b8a08809e67c2a1a2ec153d9
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Revert "alloc bitmap structures using itempools"
This reverts commit 0cc19b10fcd9f43bb4c9d83654d2d07cad139b12.
This caused memory leakage, as the memory pool is removed before the core has destroyed all the bitmaps.
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 5ba7402..6984d3e 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -44,28 +44,21 @@
#include "amiga/misc.h"
#include "amiga/rtg.h"
-static APTR pool_bitmap = NULL;
-
/* exported function documented in amiga/bitmap.h */
void *amiga_bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
+
+ bitmap = ami_misc_allocvec_clear(sizeof(struct bitmap), 0);
+ if(bitmap)
+ {
+ bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
+ bitmap->width = width;
+ bitmap->height = height;
- bitmap = ami_misc_itempool_alloc(pool_bitmap, sizeof(struct bitmap));
- if(bitmap == NULL) return NULL;
-
- bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
- bitmap->width = width;
- bitmap->height = height;
-
- if(state & BITMAP_OPAQUE) bitmap->opaque = true;
- else bitmap->opaque = false;
-
- bitmap->nativebm = NULL;
- bitmap->nativebmwidth = 0;
- bitmap->nativebmheight = 0;
- bitmap->native_mask = NULL;
- bitmap->dto = NULL;
+ if(state & BITMAP_OPAQUE) bitmap->opaque = true;
+ else bitmap->opaque = false;
+ }
return bitmap;
}
@@ -116,7 +109,7 @@ void amiga_bitmap_destroy(void *bitmap)
bm->native_mask = NULL;
bm->dto = NULL;
- ami_misc_itempool_free(pool_bitmap, bm, sizeof(struct bitmap));
+ FreeVec(bm);
bm = NULL;
}
}
@@ -589,20 +582,6 @@ static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content)
return NSERROR_OK;
}
-void amiga_bitmap_fini(void)
-{
- if(pool_bitmap) ami_misc_itempool_delete(pool_bitmap);
-}
-
-bool amiga_bitmap_init(void)
-{
- if((pool_bitmap = ami_misc_itempool_create(sizeof(struct bitmap)))) {
- return true;
- } else {
- return false;
- }
-}
-
static struct gui_bitmap_table bitmap_table = {
.create = amiga_bitmap_create,
.destroy = amiga_bitmap_destroy,
diff --git a/amiga/bitmap.h b/amiga/bitmap.h
index 4607d9f..ff1b01c 100755
--- a/amiga/bitmap.h
+++ b/amiga/bitmap.h
@@ -53,9 +53,6 @@ PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap);
struct bitmap *ami_bitmap_from_datatype(char *filename);
-void amiga_bitmap_fini(void);
-bool amiga_bitmap_init(void);
-
#ifndef __amigaos4__
void ami_bitmap_argb_to_rgba(struct bitmap *bm);
#endif
diff --git a/amiga/gui.c b/amiga/gui.c
index 9aedad8..58e7938 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -405,21 +405,8 @@ bool ami_locate_resource(char *fullpath, const char *file)
return found;
}
-/* Frees stuff opened by ami_open_resources() */
-static void ami_resources_free(void)
-{
- FreeSysObject(ASOT_PORT, appport);
- FreeSysObject(ASOT_PORT, sport);
- FreeSysObject(ASOT_PORT, schedulermsgport);
-
- FreeStringClass(urlStringClass);
- amiga_bitmap_fini();
-}
-
static bool ami_open_resources(void)
{
- if(!amiga_bitmap_init()) return false;
-
urlStringClass = MakeStringClass();
if(!(appport = AllocSysObjectTags(ASOT_PORT,
@@ -3047,10 +3034,13 @@ static void gui_quit(void)
LOG("Freeing scheduler resources");
ami_schedule_free();
- ami_resources_free();
+ FreeSysObject(ASOT_PORT, appport);
+ FreeSysObject(ASOT_PORT, sport);
+ FreeSysObject(ASOT_PORT, schedulermsgport);
ami_file_req_free();
ami_openurl_close();
+ FreeStringClass(urlStringClass);
FreeObjList(window_list);
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 43 +++++++++++--------------------------------
amiga/bitmap.h | 3 ---
amiga/gui.c | 18 ++++--------------
3 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 5ba7402..6984d3e 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -44,28 +44,21 @@
#include "amiga/misc.h"
#include "amiga/rtg.h"
-static APTR pool_bitmap = NULL;
-
/* exported function documented in amiga/bitmap.h */
void *amiga_bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
+
+ bitmap = ami_misc_allocvec_clear(sizeof(struct bitmap), 0);
+ if(bitmap)
+ {
+ bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
+ bitmap->width = width;
+ bitmap->height = height;
- bitmap = ami_misc_itempool_alloc(pool_bitmap, sizeof(struct bitmap));
- if(bitmap == NULL) return NULL;
-
- bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff);
- bitmap->width = width;
- bitmap->height = height;
-
- if(state & BITMAP_OPAQUE) bitmap->opaque = true;
- else bitmap->opaque = false;
-
- bitmap->nativebm = NULL;
- bitmap->nativebmwidth = 0;
- bitmap->nativebmheight = 0;
- bitmap->native_mask = NULL;
- bitmap->dto = NULL;
+ if(state & BITMAP_OPAQUE) bitmap->opaque = true;
+ else bitmap->opaque = false;
+ }
return bitmap;
}
@@ -116,7 +109,7 @@ void amiga_bitmap_destroy(void *bitmap)
bm->native_mask = NULL;
bm->dto = NULL;
- ami_misc_itempool_free(pool_bitmap, bm, sizeof(struct bitmap));
+ FreeVec(bm);
bm = NULL;
}
}
@@ -589,20 +582,6 @@ static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content)
return NSERROR_OK;
}
-void amiga_bitmap_fini(void)
-{
- if(pool_bitmap) ami_misc_itempool_delete(pool_bitmap);
-}
-
-bool amiga_bitmap_init(void)
-{
- if((pool_bitmap = ami_misc_itempool_create(sizeof(struct bitmap)))) {
- return true;
- } else {
- return false;
- }
-}
-
static struct gui_bitmap_table bitmap_table = {
.create = amiga_bitmap_create,
.destroy = amiga_bitmap_destroy,
diff --git a/amiga/bitmap.h b/amiga/bitmap.h
index 4607d9f..ff1b01c 100755
--- a/amiga/bitmap.h
+++ b/amiga/bitmap.h
@@ -53,9 +53,6 @@ PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap);
struct bitmap *ami_bitmap_from_datatype(char *filename);
-void amiga_bitmap_fini(void);
-bool amiga_bitmap_init(void);
-
#ifndef __amigaos4__
void ami_bitmap_argb_to_rgba(struct bitmap *bm);
#endif
diff --git a/amiga/gui.c b/amiga/gui.c
index 9aedad8..58e7938 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -405,21 +405,8 @@ bool ami_locate_resource(char *fullpath, const char *file)
return found;
}
-/* Frees stuff opened by ami_open_resources() */
-static void ami_resources_free(void)
-{
- FreeSysObject(ASOT_PORT, appport);
- FreeSysObject(ASOT_PORT, sport);
- FreeSysObject(ASOT_PORT, schedulermsgport);
-
- FreeStringClass(urlStringClass);
- amiga_bitmap_fini();
-}
-
static bool ami_open_resources(void)
{
- if(!amiga_bitmap_init()) return false;
-
urlStringClass = MakeStringClass();
if(!(appport = AllocSysObjectTags(ASOT_PORT,
@@ -3047,10 +3034,13 @@ static void gui_quit(void)
LOG("Freeing scheduler resources");
ami_schedule_free();
- ami_resources_free();
+ FreeSysObject(ASOT_PORT, appport);
+ FreeSysObject(ASOT_PORT, sport);
+ FreeSysObject(ASOT_PORT, schedulermsgport);
ami_file_req_free();
ami_openurl_close();
+ FreeStringClass(urlStringClass);
FreeObjList(window_list);
--
NetSurf Browser
7 years, 8 months