From 97b3905239a69b1cbb4a5eb637f94b8bb3311341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hendrik=20J=C3=BCrgens?= <hej@ashampoo.com>
Date: Thu, 5 Nov 2015 15:56:12 +0100
Subject: [PATCH 1/2] fix memory leaks

---
 ResizeImage/ResizeImage.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ResizeImage/ResizeImage.cpp b/ResizeImage/ResizeImage.cpp
index f5545ab..aa0db2a 100644
--- a/ResizeImage/ResizeImage.cpp
+++ b/ResizeImage/ResizeImage.cpp
@@ -195,13 +195,13 @@ void CResizeImage::ScaleDown(void)
 		newline += newrowsize;
 	}
 
-	delete rows;
-	delete nrxA;
-	delete ixA;
-	delete iyA;
-	delete dxA;
-	delete dyA;
-	delete dxB;
+	delete[] rows;
+	delete[] nrxA;
+	delete[] ixA;
+	delete[] iyA;
+	delete[] dxA;
+	delete[] dyA;
+	delete[] dxB;
 }
 
 void CResizeImage::ScaleDownPreCalculate(int* &ixA, float* &dxA, int* &nrxA, float* &dxB)
@@ -302,18 +302,18 @@ void CResizeImage::ScaleUp(void)
 		}
     }
 
-	delete startx;
-	delete endx;
-	delete starty;
-	delete endy;
+	delete[] startx;
+	delete[] endx;
+	delete[] starty;
+	delete[] endy;
     for (int t1 = 0; t1 < newwidth; t1++)
-        delete hweights[t1];
-    delete hweights;
+        delete[] hweights[t1];
+    delete[] hweights;
     for (int t1 = 0; t1 < newheight; t1++)
-        delete vweights[t1];
-    delete vweights;
-	delete hdensity;
-	delete vdensity;
+        delete[] vweights[t1];
+    delete[] vweights;
+	delete[] hdensity;
+	delete[] vdensity;
 }
 
 void CResizeImage::ScaleUpPreCalculate(

From a12225f01fc7fb6ea147c9e9e382dea8f9041a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hendrik=20J=C3=BCrgens?= <hej@ashampoo.com>
Date: Thu, 5 Nov 2015 15:58:35 +0100
Subject: [PATCH 2/2] add alpha scaling

---
 ResizeImage/ResizeImage.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ResizeImage/ResizeImage.cpp b/ResizeImage/ResizeImage.cpp
index aa0db2a..68f44ad 100644
--- a/ResizeImage/ResizeImage.cpp
+++ b/ResizeImage/ResizeImage.cpp
@@ -125,7 +125,7 @@ void CResizeImage::ScaleDown(void)
 	unsigned char *newline = newbuffer, *c1, *c2;
 	float starty, endy = 0.0f, dy, diffY;
 	int pos, nrx, nrx1, nry, t3, t6;
-	float sum1, sum2, sum3, f, area;
+	float sum1, sum2, sum3, sum4, f, area;
 
 	ScaleDownPreCalculate(ixA, dxA, nrxA, dxB);
 
@@ -162,7 +162,7 @@ void CResizeImage::ScaleDown(void)
 		{
 			t3 = nrxA[t2];
 			area = (1.0f / (dxB[t2] * diffY)) * GAMMASIZE;
-			sum1 = sum2 = sum3 = 0.0f;
+			sum1 = sum2 = sum3 = sum4 = 0.0f;
 
 			for (int t4 = 0; t4 < nry; t4++)
 			{
@@ -179,6 +179,7 @@ void CResizeImage::ScaleDown(void)
 					sum1 += togamma[c2[0]] * f;
 					sum2 += togamma[c2[1]] * f;
 					sum3 += togamma[c2[2]] * f;
+					sum4 += togamma[c2[2]] * f;
 
 					nrx1++;
 				}
@@ -187,6 +188,7 @@ void CResizeImage::ScaleDown(void)
 			newline[t6 + 0] = fromgamma[(int)(sum1 * area)];
 			newline[t6 + 1] = fromgamma[(int)(sum2 * area)];
 			newline[t6 + 2] = fromgamma[(int)(sum3 * area)];
+			newline[t6 + 3] = fromgamma[(int)(sum4 * area)];
 
 			nrx += t3;
 			t6  += newbpp;
@@ -207,7 +209,7 @@ void CResizeImage::ScaleDown(void)
 void CResizeImage::ScaleDownPreCalculate(int* &ixA, float* &dxA, int* &nrxA, float* &dxB)
 {
 	int nrcols = (int)ceil(fx + 1.0f);
-	int nrx = 0, nrx1;
+	int nrx = 0, nrx1 = 0;
 	float startx = 0.0f;
 	float endx = fx;
 
@@ -252,7 +254,7 @@ void CResizeImage::ScaleUp(void)
 	float **hweights, **vweights;
 	float *hdensity, *vdensity;
 	float *vweight, *hweight;
-	float sumh1, sumh2, sumh3, sumv1, sumv2, sumv3;
+	float sumh1, sumh2, sumh3, sumh4, sumv1, sumv2, sumv3, sumv4;
 
 	ScaleUpPreCalculate(startx, endx, starty, endy, hweights, vweights, hdensity, vdensity);
 
@@ -266,14 +268,14 @@ void CResizeImage::ScaleUp(void)
 			nmaxh = endx[t2] - startx[t2];
 			unsigned char* ypos = buffer + starty[t1] * rowsize;
 
-			sumv1 = sumv2 = sumv3 = 0.0f;
+			sumv1 = sumv2 = sumv3 = sumv4 = 0.0f;
             vweight = vweights[t1];
 
 			for (int t3 = 0; t3 < nmaxv; t3++)
 			{
 				unsigned char *xpos = ypos + startx[t2] * bpp;
 
-				sumh1 = sumh2 = sumh3 = 0.0f;
+				sumh1 = sumh2 = sumh3 = sumh4 = 0.0f;
                 hweight = hweights[t2];
 
 				for (int t4 = 0; t4 < nmaxh; t4++)
@@ -281,6 +283,7 @@ void CResizeImage::ScaleUp(void)
 					sumh1 += *hweight * togamma[xpos[0]];
 					sumh2 += *hweight * togamma[xpos[1]];
 					sumh3 += *hweight * togamma[xpos[2]];
+					sumh4 += *hweight * togamma[xpos[3]];
 
 					xpos += bpp;
                     hweight++;
@@ -289,6 +292,7 @@ void CResizeImage::ScaleUp(void)
 				sumv1 += *vweight * sumh1;
 				sumv2 += *vweight * sumh2;
 				sumv3 += *vweight * sumh3;
+				sumv4 += *vweight * sumh4;
 
 				ypos += rowsize;
                 vweight++;
@@ -297,6 +301,7 @@ void CResizeImage::ScaleUp(void)
 			line[0] = fromgamma[(int)(CAP(sumv1) * GAMMASIZE)];
 			line[1] = fromgamma[(int)(CAP(sumv2) * GAMMASIZE)];
 			line[2] = fromgamma[(int)(CAP(sumv3) * GAMMASIZE)];
+			line[3] = fromgamma[(int)(CAP(sumv4) * GAMMASIZE)];
 
             line += newbpp;
 		}