[patch] Memory leak fix backport from 1.3.2cvs

scribus-bug-2787-memory-leak-fix.patch (text/plain), 1.12 KB, created by Craig Bradney on 2005-11-02 15:24:04 UTC

--- util.cpp	2005-09-17 05:55:05.000000000 +0200
+++ utilmemleakfixed.cpp	2005-11-03 00:22:32.000000000 +0100
@@ -1201,20 +1201,20 @@
 {
 	static QMap<QRgb, QPixmap*> pxCache;
 
-	QPixmap * pm = pxCache[rgb.rgb()];
-	if (!pm)
-	{
-		pm = new QPixmap(15, 15);
-		pm->fill(rgb);
-		QPainter p;
-		p.begin(pm);
-		p.setBrush(Qt::NoBrush);
-		QPen b(Qt::black, 1);
-		p.setPen(b);
-		p.drawRect(0, 0, 15, 15);
-		p.end();
-		pxCache[rgb.rgb()] = pm;
-	}
+	QRgb index=rgb.rgb();
+	if (pxCache.contains(index))
+		return pxCache[index];
+
+	QPixmap *pm = new QPixmap(15, 15);
+	pm->fill(rgb);
+	QPainter p;
+	p.begin(pm);
+	p.setBrush(Qt::NoBrush);
+	QPen b(Qt::black, 1);
+	p.setPen(b);
+	p.drawRect(0, 0, 15, 15);
+	p.end();
+	pxCache.insert(index, pm);
 	return pm;
 }
 
@@ -1222,12 +1222,13 @@
 {
 	static QMap<QRgb, QPixmap*> pxCache;
 
-	QPixmap * pm = pxCache[rgb.rgb()];
-	if (!pm) {
-		pm = new QPixmap(30, 15);
-		pm->fill(rgb);
-		pxCache[rgb.rgb()] = pm;
-	}
+	QRgb index=rgb.rgb();
+	if (pxCache.contains(index))
+		return pxCache[index];
+
+	QPixmap *pm = new QPixmap(30, 15);
+	pm->fill(rgb);
+	pxCache.insert(index, pm);
 	return pm;
 }