From kde-commits  Fri Jan 20 16:23:32 2006
From: Rob Buis <buis () kde ! org>
Date: Fri, 20 Jan 2006 16:23:32 +0000
To: kde-commits
Subject: kdenonbeta
Message-Id: <1137774212.599087.21857.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113777430829014

SVN commit 500581 by buis:

Fixing rendering-shapes and some transform fixes.


 M  +3 -3      kcanvas/device/qt/KCanvasImageItemQt.cpp  
 M  +2 -2      kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp  
 M  +1 -1      kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp  
 M  +1 -1      ksvg2/svg/SVGElementImpl.h  
 M  +1 -1      ksvg2/svg/svgpathparser.cpp  


--- trunk/kdenonbeta/kcanvas/device/qt/KCanvasImageItemQt.cpp #500580:500581
@@ -61,7 +61,7 @@
     double y2 = bounds().bottom();
     qtContext->painter().save();
     qtContext->concatCTM(style()->objectMatrix());
-	QMatrix imgMatrix = qtContext->worldTransform() * qtContext->ctm().qmatrix();
+	QMatrix imgMatrix = qtContext->ctm().qmatrix() * qtContext->worldTransform();
     if(style())
     {
         //agg::bounding_rect(aggData->curvedPath, theGetIdDummy, 0, 1, &x1, &y1, &x2, &y2);
@@ -71,9 +71,9 @@
 	    //QMatrix world = qtContext->worldTransform();
 		//imgMatrix *= world;
 //        KCanvasMatrix objectMatrix = style()->objectMatrix();
-//        imgMatrix *= QMatrix().translate(x1, y1);
         KCanvasMatrix mat = getAspectRatio(logical, physical);
-        imgMatrix *= QMatrix(mat.a(), mat.b(), mat.c(), mat.d(), mat.e() + x1, mat.f() + y1);
+        imgMatrix *= QMatrix(mat.a(), mat.b(), mat.c(), mat.d(), mat.e(), mat.f());
+		imgMatrix *= QMatrix().translate(x1, y1);
 //        imgMatrix *= QMatrix(objectMatrix.a(), objectMatrix.b(), objectMatrix.c(), objectMatrix.d(), objectMatrix.e(), objectMatrix.f());
     }
     qtContext->painter().setMatrix(imgMatrix);
--- trunk/kdenonbeta/kcanvas/device/qt/KRenderingPaintServerGradientQt.cpp #500580:500581
@@ -100,7 +100,7 @@
     qtContext->painter().setPen(Qt::NoPen);
     qtContext->painter().setBrush(Qt::NoBrush);
     qtContext->concatCTM(style->objectMatrix());
-    qtContext->painter().setMatrix(qtContext->worldTransform() * qtContext->ctm().qmatrix());
+    qtContext->painter().setMatrix(qtContext->ctm().qmatrix() * qtContext->worldTransform());
 
 	QLinearGradient gradient(QPointF(x1, y1), QPointF(x2, y2));
     if(spreadMethod() == SPREADMETHOD_REPEAT)
@@ -178,7 +178,7 @@
     qtContext->painter().setPen(Qt::NoPen);
     qtContext->painter().setBrush(Qt::NoBrush);
     qtContext->concatCTM(style->objectMatrix());
-    QMatrix mat = qtContext->worldTransform() * qtContext->ctm().qmatrix();
+    QMatrix mat = qtContext->ctm().qmatrix() * qtContext->worldTransform();
 	//qtContext->painter().setMatrix(mat);
 
     //KCanvasMatrix objectMatrix = style->objectMatrix();
--- trunk/kdenonbeta/kcanvas/device/qt/KRenderingPaintServerSolidQt.cpp #500580:500581
@@ -56,7 +56,7 @@
 
     qtContext->painter().save();
     qtContext->concatCTM(style->objectMatrix());
-    qtContext->painter().setMatrix(qtContext->worldTransform() * qtContext->ctm().qmatrix());
+    qtContext->painter().setMatrix(qtContext->ctm().qmatrix() * qtContext->worldTransform());
     qtContext->painter().setBrush(Qt::NoBrush);
     qtContext->painter().setPen(Qt::NoPen);
     if(type & APPLY_TO_FILL)
--- trunk/kdenonbeta/ksvg2/svg/SVGElementImpl.h #500580:500581
@@ -70,7 +70,7 @@
 
         SVGDocumentImpl *getDocument() const;
 
-		virtual void attributeChanged(KDOM::AttributeImpl *attr, bool = false);
+        virtual void attributeChanged(KDOM::AttributeImpl *attr, bool = false);
 
         virtual bool isValid() const { return true; }
 
--- trunk/kdenonbeta/ksvg2/svg/svgpathparser.cpp #500580:500581
@@ -124,7 +124,7 @@
         QByteArray latinData = data.toLatin1();
 
         const char *ptr = latinData.constData();
-        const char *end = ptr + data.length();
+        const char *end = ptr + data.length() + 1;
 
         double contrlx = 0.0, contrly = 0.0, curx = 0.0, cury = 0.0, subpathx = 0.0, subpathy = 0.0;
         double tox, toy, x1, y1, x2, y2, xc, yc;