From 685385635fe87742732174365daa03264b0d5ed6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 26 Jan 2016 12:05:40 +0100
Subject: [PATCH] - made adjustments to FGLBitmap for the changes in its base
 class.

---
 src/gl/textures/gl_bitmap.cpp | 14 ++++++++------
 src/gl/textures/gl_bitmap.h   |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/gl/textures/gl_bitmap.cpp b/src/gl/textures/gl_bitmap.cpp
index a2319f67c..991ebc650 100644
--- a/src/gl/textures/gl_bitmap.cpp
+++ b/src/gl/textures/gl_bitmap.cpp
@@ -51,28 +51,30 @@
 //
 //===========================================================================
 template<class T>
-void iCopyColors(unsigned char * pout, const unsigned char * pin, int count, int step)
+void iCopyColors(unsigned char * pout, const unsigned char * pin, int count, int step, BYTE tr, BYTE tg, BYTE tb)
 {
 	int i;
+	unsigned char a;
 
 	for(i=0;i<count;i++)
 	{
-		if (T::A(pin) != 0)
+		if ((a = T::A(pin, tr, tg, tb)) != 0)
 		{
 			pout[0]=T::R(pin);
 			pout[1]=T::G(pin);
 			pout[2]=T::B(pin);
-			pout[3]=T::A(pin);
+			pout[3]=a;
 		}
 		pout+=4;
 		pin+=step;
 	}
 }
 
-typedef void (*CopyFunc)(unsigned char * pout, const unsigned char * pin, int count, int step);
+typedef void (*CopyFunc)(unsigned char * pout, const unsigned char * pin, int count, int step, BYTE tr, BYTE tg, BYTE tb);
 
 static CopyFunc copyfuncs[]={
 	iCopyColors<cRGB>,
+	iCopyColors<cRGBT>,
 	iCopyColors<cRGBA>,
 	iCopyColors<cIA>,
 	iCopyColors<cCMYK>,
@@ -92,14 +94,14 @@ static CopyFunc copyfuncs[]={
 //===========================================================================
 void FGLBitmap::CopyPixelDataRGB(int originx, int originy,
 								const BYTE * patch, int srcwidth, int srcheight, int step_x, int step_y,
-								int rotate, int ct, FCopyInfo *inf)
+								int rotate, int ct, FCopyInfo *inf,	int r, int g, int b)
 {
 	if (ClipCopyPixelRect(&ClipRect, originx, originy, patch, srcwidth, srcheight, step_x, step_y, rotate))
 	{
 		BYTE *buffer = GetPixels() + 4*originx + Pitch*originy;
 		for (int y=0;y<srcheight;y++)
 		{
-			copyfuncs[ct](&buffer[y*Pitch], &patch[y*step_y], srcwidth, step_x);
+			copyfuncs[ct](&buffer[y*Pitch], &patch[y*step_y], srcwidth, step_x, (BYTE)r, (BYTE)g, (BYTE)b);
 		}
 	}
 }
diff --git a/src/gl/textures/gl_bitmap.h b/src/gl/textures/gl_bitmap.h
index 6aea6d008..e8b06b833 100644
--- a/src/gl/textures/gl_bitmap.h
+++ b/src/gl/textures/gl_bitmap.h
@@ -27,7 +27,9 @@ public:
 	}
 
 	virtual void CopyPixelDataRGB(int originx, int originy, const BYTE *patch, int srcwidth, 
-								int srcheight, int step_x, int step_y, int rotate, int ct, FCopyInfo *inf = NULL);
+								int srcheight, int step_x, int step_y, int rotate, int ct, FCopyInfo *inf = NULL,
+		/* for PNG tRNS */		int r=0, int g=0, int b=0);
+
 	virtual void CopyPixelData(int originx, int originy, const BYTE * patch, int srcwidth, int srcheight, 
 								int step_x, int step_y, int rotate, PalEntry * palette, FCopyInfo *inf = NULL);
 };