summaryrefslogtreecommitdiff
path: root/amiga/bitmap.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2012-08-10 19:31:16 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2012-08-10 19:31:16 +0100
commit6aaf1065752b13896f71cb489e11388cb9c444d6 (patch)
tree09dc28743a5a9a17a9553e34b66a0c93000e9d24 /amiga/bitmap.c
parentbc4401414b7c964544354a92795cff007b56064d (diff)
downloadnetsurf-6aaf1065752b13896f71cb489e11388cb9c444d6.tar.gz
netsurf-6aaf1065752b13896f71cb489e11388cb9c444d6.tar.bz2
remove AMI_CUSTOM_MASK define
Diffstat (limited to 'amiga/bitmap.c')
-rw-r--r--amiga/bitmap.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 7a3e7016b..381958b34 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -16,8 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define AMI_CUSTOM_MASK 1
-
#include "amiga/os3support.h"
#include "assert.h"
@@ -127,9 +125,8 @@ void bitmap_destroy(void *bitmap)
if(bm->dto) {
DisposeDTObject(bm->dto);
}
-#ifdef AMI_CUSTOM_MASK
+
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
-#endif
FreeVec(bm->pixdata);
bm->pixdata = NULL;
bm->nativebm = NULL;
@@ -180,9 +177,7 @@ void bitmap_modified(void *bitmap) {
p96FreeBitMap(bm->nativebm);
if(bm->dto) DisposeDTObject(bm->dto);
-#ifdef AMI_CUSTOM_MASK
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
-#endif
bm->nativebm = NULL;
bm->dto = NULL;
bm->native_mask = NULL;
@@ -552,17 +547,12 @@ static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap,
GetDTAttrs(bitmap->dto,
PDTA_DestBitMap, &dtbm,
-#ifndef AMI_CUSTOM_MASK
- PDTA_MaskPlane, &bitmap->native_mask,
-#endif
TAG_END);
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
-#ifdef AMI_CUSTOM_MASK
ami_bitmap_get_mask(bitmap, width, height);
-#endif
return dtbm;
}