[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-artists
Subject:    [kde-artists] KDE/kdelibs
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2006-09-12 20:22:30
Message-ID: 1158092550.695515.28748.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 583621 by ossi:

svgz support.

also, zero out the image before rendering - nobody except the kernel
does this for us, and we don't want to rely too much on the allocator,
do we?


 M  +8 -6      kdecore/kiconloader.cpp  
 M  +6 -5      kio/kfile/kicondialog.cpp  
 M  +4 -4      pics/ksvgtopng.cpp  


--- trunk/KDE/kdelibs/kdecore/kiconloader.cpp #583620:583621
@@ -23,7 +23,6 @@
 #include <QHash>
 #include <QPainter>
 #include <QMovie>
-#include <QSvgRenderer>
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -31,6 +30,7 @@
 #include <kconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>
+#include <ksvgrenderer.h>
 
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -748,12 +748,14 @@
 	else
 	{
 	    // Special stuff for SVG icons
-            img = new QImage(size, size, QImage::Format_ARGB32_Premultiplied);
-            QPainter p(img);
-            QSvgRenderer renderer(icon.path);
-            if (renderer.isValid())
+            KSvgRenderer renderer(icon.path);
+            if (renderer.isValid()) {
+                img = new QImage(size, size, QImage::Format_ARGB32_Premultiplied);
+                img->fill(0);
+                QPainter p(img);
                 renderer.render(&p);
-            p.end();
+            } else
+                return pix;
 	}
 
         iconType = icon.type;
--- trunk/KDE/kdelibs/kio/kfile/kicondialog.cpp #583620:583621
@@ -39,8 +39,8 @@
 #include <qfileinfo.h>
 #include <qtoolbutton.h>
 #include <qprogressbar.h>
+#include <ksvgrenderer.h>
 
-#include <QSvgRenderer>
 #include <QImage>
 #include <QPainter>
 
@@ -151,11 +151,12 @@
 	else {
             // Special stuff for SVG icons
             img = QImage(60, 60, QImage::Format_ARGB32_Premultiplied);
-            QPainter p(&img);
-            QSvgRenderer renderer(*it);
-            if (renderer.isValid())
+            img.fill(0);
+            KSvgRenderer renderer(*it);
+            if (renderer.isValid()) {
+                QPainter p(&img);
                 renderer.render(&p);
-            p.end();
+            }
         }
 
 	if (img.isNull())
--- trunk/KDE/kdelibs/pics/ksvgtopng.cpp #583620:583621
@@ -2,7 +2,7 @@
 #include <qstring.h>
 
 #include <kimageeffect.h>
-#include <QSvgRenderer>
+#include <ksvgrenderer.h>
 #include <QPainter>
 #include <iostream>
 
@@ -22,13 +22,13 @@
 	int height = atoi(argv[2]);
 
 	QImage img(width, height, QImage::Format_ARGB32_Premultiplied);
-	QPainter p(&img);
-	QSvgRenderer renderer(QString::fromLocal8Bit(argv[3]));
+	img.fill(0);
 
+	KSvgRenderer renderer(QString::fromLocal8Bit(argv[3]));
 	if(renderer.isValid())
 	{
+	        QPainter p(&img);
 		renderer.render(&p);
-		p.end();
 /*
 		// Apply icon sharpening
 		double factor = 0;
______________________________________________________________________________
kde-artists@kde.org |  https://mail.kde.org/mailman/listinfo/kde-artists
[prev in list] [next in list] [prev in thread] [next in thread]