X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fgfxutil.h;h=adbbd15cc74f777c1c573ce32d4cb21cc6392566;hp=cf644873a66fa7248401557b8dbb6f898a5990ab;hb=c1029b14c3fde9c98d524f17201364c695b6b117;hpb=13f4229ee540e22a5f3ede4d345ae1269cd708d3

diff --git a/src/gfxutil.h b/src/gfxutil.h
index cf64487..adbbd15 100644
--- a/src/gfxutil.h
+++ b/src/gfxutil.h
@@ -4,8 +4,8 @@
 #include "inttypes.h"
 
 #define PACK_RGB16(r, g, b) \
-	(((((uint16_t)(r) >> 3) & 0x1f) << 11) | \
-	 ((((uint16_t)(g) >> 2) & 0x3f) << 5) | \
+	((((uint16_t)(r) << 8) & 0xf800) | \
+	 (((uint16_t)(g) << 3) & 0x7e0) | \
 	 (((uint16_t)(b) >> 3) & 0x1f))
 
 #define UNPACK_R16(c)	(((c) >> 8) & 0xf8)
@@ -15,10 +15,17 @@
 #define PACK_RGB32(r, g, b) \
 	((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
 
+#define UNPACK_R32(c)	(((c) >> 16) & 0xff)
+#define UNPACK_G32(c)	(((c) >> 8) & 0xff)
+#define UNPACK_B32(c)	((c) & 0xff)
+
 int clip_line(int *x0, int *y0, int *x1, int *y1, int xmin, int ymin, int xmax, int ymax);
 void draw_line(int x0, int y0, int x1, int y1, unsigned short color);
 
-void blur_grey_horiz(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius);
-void blur_grey_vert(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius);
+/* scale in 24.8 fixed point */
+void blur_grey_horiz(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius, int scale);
+void blur_grey_vert(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius, int scale);
+
+void convimg_rgb24_rgb16(uint16_t *dest, unsigned char *src, int xsz, int ysz);
 
 #endif	/* GFXUTIL_H_ */