cppcanvas/source/inc/implrenderer.hxx | 1 -
cppcanvas/source/mtfrenderer/emfplus.cxx | 15 ---------------
cppcanvas/source/mtfrenderer/implrenderer.cxx | 3 ---
vcl/source/filter/wmf/winmtf.cxx | 9 ---------
4 files changed, 28 deletions(-)
New commits:
commit 2b700a710e44d2d09f45793f5f2448268e66d4fe
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Wed Jun 12 10:03:28 2013 +0200
EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it
Change-Id: Ifa4f42c4f17a70c7238347a13897ef6742eb4679
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index ae47ab8..63cce82f 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -286,7 +286,6 @@ static float GetSwapFloat( SvStream& rSt )
ActionVector maActions;
/* EMF+ */
- XForm aBaseTransform;
XForm aWorldTransform;
EMFPObject* aObjects [256];
float fPageScale;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 47fa726..c73d7f1 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -853,9 +853,6 @@ namespace cppcanvas
x -= nFrameLeft;
y -= nFrameTop;
- x *= aBaseTransform.eM11;
- y *= aBaseTransform.eM22;
-
return ::basegfx::B2DPoint (x, y);
}
@@ -868,9 +865,6 @@ namespace cppcanvas
MapToDevice (w, h);
- w *= aBaseTransform.eM11;
- h *= aBaseTransform.eM22;
-
return ::basegfx::B2DSize (w, h);
}
@@ -921,7 +915,6 @@ namespace cppcanvas
::basegfx::B2DHomMatrix aTextureTransformation;
::basegfx::B2DHomMatrix aWorldTransformation;
- ::basegfx::B2DHomMatrix aBaseTransformation;
rendering::Texture aTexture;
aWorldTransformation.set (0, 0, aWorldTransform.eM11);
@@ -931,13 +924,6 @@ namespace cppcanvas
aWorldTransformation.set (1, 1, aWorldTransform.eM22);
aWorldTransformation.set (1, 2, aWorldTransform.eDy);
- aBaseTransformation.set (0, 0, aBaseTransform.eM11);
- aBaseTransformation.set (0, 1, aBaseTransform.eM21);
- aBaseTransformation.set (0, 2, aBaseTransform.eDx);
- aBaseTransformation.set (1, 0, aBaseTransform.eM12);
- aBaseTransformation.set (1, 1, aBaseTransform.eM22);
- aBaseTransformation.set (1, 2, aBaseTransform.eDy);
-
if (brush->type == 4) {
aTextureTransformation.scale (brush->areaWidth,
brush->areaHeight);
aTextureTransformation.translate (brush->areaX,
brush->areaY);
@@ -964,7 +950,6 @@ namespace cppcanvas
aTextureTransformation.scale (100.0*nMmX/nPixX,
100.0*nMmY/nPixY);
aTextureTransformation.translate (-nFrameLeft, -nFrameTop);
aTextureTransformation *= rState.mapModeTransform;
- aTextureTransformation *= aBaseTransformation;
aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;
aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index ca217d1..2fcff5a 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1873,9 +1873,6 @@ namespace cppcanvas
SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: "
<< nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," <<
nFrameBottom);
rMF >> nPixX >> nPixY >> nMmX >> nMmY;
SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel
size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY);
-
- rMF >> aBaseTransform;
- //aWorldTransform.Set (aBaseTransform);
}
}
break;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index ac3fec1..62530c1 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -2251,15 +2251,6 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
mem << nLeft << nTop << nRight << nBottom;
mem << mnPixX << mnPixY << mnMillX << mnMillY;
- float one, zero;
-
- one = 1;
- zero = 0;
-
- // add transformation matrix to be used in vcl's metaact.cxx for
- // rotate and scale operations
- mem << one << zero << zero << one << zero << zero;
-
// need to flush the stream, otherwise GetEndOfData will return 0
// on windows where the function parameters are probably resolved in
reverse order
mem.Flush();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
