From 6aaf1065752b13896f71cb489e11388cb9c444d6 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Fri, 10 Aug 2012 19:31:16 +0100
Subject: remove AMI_CUSTOM_MASK define

---
 amiga/bitmap.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'amiga/bitmap.c')

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;
 }
 
-- 
cgit v1.2.3