shithub: drawterm

Download patch

ref: cc4362cfd57f97fb9e4ab8893a2152398d535f23
parent: 525ffef137e7ce97e8e149f55488a9f5327b55c8
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Thu Nov 17 13:51:45 EST 2016

libmemdraw: remove unused static drawbuf variables and ptrfn() declaration

--- a/include/memdraw.h	Thu Nov 17 12:22:00 2016
+++ b/include/memdraw.h	Thu Nov 17 13:51:45 2016
@@ -176,5 +176,3 @@
 extern void	rdb(void);
 extern int		iprint(char*, ...);
 extern int		drawdebug;
-
-extern ulong	pixelbits(Memimage*, Point);
--- a/libmemdraw/draw.c	Thu Nov 17 12:22:00 2016
+++ b/libmemdraw/draw.c	Thu Nov 17 13:51:45 2016
@@ -89,6 +89,7 @@
 
 static ulong imgtorgba(Memimage*, ulong);
 static ulong rgbatoimg(Memimage*, ulong);
+static ulong pixelbits(Memimage*, Point);
 
 #define DBG if(0)
 void
@@ -453,9 +454,6 @@
 	int	convdx;
 };
 
-static uchar *drawbuf;
-static int	ndrawbuf;
-static int	mdrawbuf;
 static Readfn	greymaskread, replread, readptr;
 static Writefn	nullwrite;
 static Calcfn	alphacalc0, alphacalc14, alphacalc2810, alphacalc3679, alphacalc5, alphacalc11, alphacalcS;
@@ -467,7 +465,6 @@
 
 static Calcfn*	boolcopyfn(Memimage*, Memimage*);
 static Readfn*	convfn(Memimage*, Param*, Memimage*, Param*, int*);
-static Readfn*	ptrfn(Memimage*);
 
 static Calcfn *alphacalc[Ncomp] = 
 {
@@ -1966,7 +1963,7 @@
 	return genconv;
 }
 
-ulong
+static ulong
 pixelbits(Memimage *i, Point pt)
 {
 	uchar *p;
@@ -2550,31 +2547,6 @@
 }
 #undef DBG
 
-
-/*
- * Fill entire byte with replicated (if necessary) copy of source pixel,
- * assuming destination ldepth is >= source ldepth.
- *
- * This code is just plain wrong for >8bpp.
- *
-ulong
-membyteval(Memimage *src)
-{
-	int i, val, bpp;
-	uchar uc;
-
-	unloadmemimage(src, src->r, &uc, 1);
-	bpp = src->depth;
-	uc <<= (src->r.min.x&(7/src->depth))*src->depth;
-	uc &= ~(0xFF>>bpp);
-	/* pixel value is now in high part of byte. repeat throughout byte 
-	val = uc;
-	for(i=bpp; i<8; i<<=1)
-		val |= val>>i;
-	return val;
-}
- * 
- */
 
 void
 memfillcolor(Memimage *i, ulong val)