wdvi

commit cf57a0873251e525939200fbd7156b81240ead9f
parent fbb7237269d3aa6355345db891682882c5b183a7
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Mon, 13 Mar 2023 20:27:40 +0000

remove support for BMBYTES != 4

Diffstat:
M
data.h
 | 
2
+-
M
dvi-draw.c
 | 
18
------------------

2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/data.h b/data.h
@@ -6,7 +6,7 @@ struct rgb {
 };
 
 #define	BMUNIT			unsigned int
-#define	BMBYTES			4		/* sizeof(unsigned BMUNIT) */
+#define	BMBYTES			sizeof(BMUNIT)
 #define	BMBITS			(8 * BMBYTES)
 
 #define	ADD(a, b)	((BMUNIT *) (((char *) a) + b))
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -60,22 +60,6 @@ static	struct drawinf	*dvi_pointer_frame	= NULL;
 #define OFFSET_X	(offset_x << 16) + (shrink_factor * 3 << 15)
 #define OFFSET_Y	(offset_y << 16) + (shrink_factor * 3 << 15)
 
-#if (BMBYTES == 1)
-BMUNIT	bit_masks[9] = {
-	0x0,	0x1,	0x3,	0x7,
-	0xf,	0x1f,	0x3f,	0x7f,
-	0xff
-};
-#else
-#if (BMBYTES == 2)
-BMUNIT	bit_masks[17] = {
-	0x0,	0x1,	0x3,	0x7,
-	0xf,	0x1f,	0x3f,	0x7f,
-	0xff,	0x1ff,	0x3ff,	0x7ff,
-	0xfff,	0x1fff,	0x3fff,	0x7fff,
-	0xffff
-};
-#else	/* BMBYTES == 4 */
 BMUNIT	bit_masks[33] = {
 	0x0,		0x1,		0x3,		0x7,
 	0xf,		0x1f,		0x3f,		0x7f,
@@ -87,8 +71,6 @@ BMUNIT	bit_masks[33] = {
 	0xfffffff,	0x1fffffff,	0x3fffffff,	0x7fffffff,
 	0xffffffff
 };
-#endif
-#endif
 
 static	void	draw_part(struct frame *, double);