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

List:       kde-commits
Subject:    extragear/graphics/kipi-plugins/htmlexport
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2008-11-01 14:24:12
Message-ID: 1225549452.188058.24478.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 878626 by gateau:

appendImageElementToXML no longer needs a QImage reference.


 M  +7 -7      generator.cpp  


--- trunk/extragear/graphics/kipi-plugins/htmlexport/generator.cpp #878625:878626
@@ -212,11 +212,11 @@
 	/**
 	 * Helper class for generateImageAndXMLForUrl
 	 */
-	void appendImageElementToXML(XMLWriter& xmlWriter, const QString& elementName, \
const QString& fileName, const QImage& image) { +	void \
appendImageElementToXML(XMLWriter& xmlWriter, const QString& elementName, const \
QString& fileName, const QSize& size) {  XMLAttributeList attrList;
 		attrList.append("fileName", fileName);
-		attrList.append("width", image.width());
-		attrList.append("height", image.height());
+		attrList.append("width", size.width());
+		attrList.append("height", size.height());
 		XMLElement elem(xmlWriter, elementName, &attrList);
 	}
 
@@ -235,7 +235,7 @@
 			logWarning(i18n("Could not read image '%1'", path));
 			return;
 		}
-		
+
 		QString imageFormat = QImageReader::imageFormat(&imageFile);
 		if (imageFormat.isEmpty()) {
 			logWarning(i18n("Format of image '%1' is unknown", path));
@@ -310,10 +310,10 @@
 		xmlWriter.writeElement("title", info.title());
 		xmlWriter.writeElement("description", info.description());
 
-		appendImageElementToXML(xmlWriter, "full", fullFileName, fullImage);
-		appendImageElementToXML(xmlWriter, "thumbnail", thumbnailFileName, thumbnail);
+		appendImageElementToXML(xmlWriter, "full", fullFileName, fullImage.size());
+		appendImageElementToXML(xmlWriter, "thumbnail", thumbnailFileName, \
thumbnail.size());  if (mInfo->copyOriginalImage()) {
-			appendImageElementToXML(xmlWriter, "original", originalFileName, originalImage);
+			appendImageElementToXML(xmlWriter, "original", originalFileName, \
originalImage.size());  }
 	}
 


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