r6616 chris_y - /trunk/netsurf/amiga/plotters.c
Author: chris_y
Date: Tue Feb 24 18:26:46 2009
New Revision: 6616
URL: http://source.netsurf-browser.org?rev=6616&view=rev
Log:
The native bitmap caching was eating memory, this should be correct now.
Modified:
trunk/netsurf/amiga/plotters.c
Modified: trunk/netsurf/amiga/plotters.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=6616...
==============================================================================
--- trunk/netsurf/amiga/plotters.c (original)
+++ trunk/netsurf/amiga/plotters.c Tue Feb 24 18:26:46 2009
@@ -32,6 +32,7 @@
#include <graphics/composite.h>
#include "utils/log.h"
#include <math.h>
+#include <assert.h>
#ifndef M_PI /* For some reason we don't always get this from math.h */
#define M_PI 3.14159265358979323846
@@ -548,8 +549,9 @@
struct RenderInfo ri;
ULONG xf,yf,wf,hf;
int max_width,max_height;
- struct BitMap *tbm;
+ struct BitMap *tbm = NULL;
struct RastPort trp;
+ bool gotscaledbm = false;
/*
SetRPAttrs(currp,RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,bg),
@@ -561,18 +563,23 @@
if(bitmap->nativebm)
{
- if((bitmap->nativebmwidth != width) || (bitmap->nativebmheight != height))
- {
- p96FreeBitMap(bitmap->nativebm);
+ if((bitmap->nativebmwidth == width) && (bitmap->nativebmheight==height))
+ {
+ tbm = bitmap->nativebm;
+ gotscaledbm = true;
+ }
+ else if((bitmap->nativebmwidth == bitmap->width) &&
(bitmap->nativebmheight==bitmap->height))
+ {
+ tbm = bitmap->nativebm;
+ }
+ else
+ {
+ if(bitmap->nativebm) p96FreeBitMap(bitmap->nativebm);
bitmap->nativebm = NULL;
}
- else
- {
- tbm = bitmap->nativebm;
- }
- }
-
- if(!bitmap->nativebm)
+ }
+
+ if(!tbm && !gotscaledbm)
{
ri.Memory = bitmap->pixdata;
ri.BytesPerRow = bitmap->width * 4;
@@ -583,7 +590,7 @@
trp.BitMap = tbm;
p96WritePixelArray((struct RenderInfo
*)&ri,0,0,&trp,0,0,bitmap->width,bitmap->height);
- if((option_cache_bitmaps == 2) && (bitmap->height == height &&
bitmap->width == width))
+ if(option_cache_bitmaps == 2)
{
bitmap->nativebm = tbm;
bitmap->nativebmwidth = bitmap->width;
@@ -591,13 +598,9 @@
}
}
- if((bitmap->nativebm) && (bitmap->nativebmwidth == width) &&
(bitmap->nativebmheight==height))
- {
- tbm = bitmap->nativebm;
- }
- else
- {
- if((bitmap->width != width) || (bitmap->height != height))
+ if((bitmap->width != width) || (bitmap->height != height))
+ {
+ if(!gotscaledbm)
{
struct BitMap *scaledbm;
struct BitScaleArgs bsa;
@@ -641,8 +644,10 @@
BitMapScale(&bsa);
}
+ if(bitmap->nativebm != tbm) p96FreeBitMap(bitmap->nativebm);
p96FreeBitMap(tbm);
tbm = scaledbm;
+ bitmap->nativebm = NULL;
if(option_cache_bitmaps >= 1)
{
@@ -666,6 +671,8 @@
/* tile down and across to extents */
for (xf = x; xf < glob.rect.MaxX; xf += width) {
for (yf = y; yf < glob.rect.MaxY; yf += height) {
+
+ assert(tbm);
BltBitMapTags(BLITA_Width,width,
BLITA_Height,height,