mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it

Browse Source 
Change-Id: Ifa4f42c4f17a70c7238347a13897ef6742eb4679
This commit is contained in:
Fridrich Štrba
2013-06-12 10:03:28 +02:00
parent 28e94510f0
commit 2b700a710e
4 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -286,7 +286,6 @@ static float GetSwapFloat( SvStream& rSt )
ActionVector maActions; ActionVector maActions;
/* EMF+ */ /* EMF+ */
XForm aBaseTransform;
XForm aWorldTransform; XForm aWorldTransform;
EMFPObject* aObjects [256]; EMFPObject* aObjects [256];
float fPageScale; float fPageScale;

15
cppcanvas/source/mtfrenderer/emfplus.cxx
View File

@@ -853,9 +853,6 @@ namespace cppcanvas
x -= nFrameLeft; x -= nFrameLeft;
y -= nFrameTop; y -= nFrameTop;
x *= aBaseTransform.eM11;
y *= aBaseTransform.eM22;
return ::basegfx::B2DPoint (x, y); return ::basegfx::B2DPoint (x, y);
} }
@@ -868,9 +865,6 @@ namespace cppcanvas
MapToDevice (w, h); MapToDevice (w, h);
w *= aBaseTransform.eM11;
h *= aBaseTransform.eM22;
return ::basegfx::B2DSize (w, h); return ::basegfx::B2DSize (w, h);
} }
@@ -921,7 +915,6 @@ namespace cppcanvas
::basegfx::B2DHomMatrix aTextureTransformation; ::basegfx::B2DHomMatrix aTextureTransformation;
::basegfx::B2DHomMatrix aWorldTransformation; ::basegfx::B2DHomMatrix aWorldTransformation;
::basegfx::B2DHomMatrix aBaseTransformation;
rendering::Texture aTexture; rendering::Texture aTexture;
aWorldTransformation.set (0, 0, aWorldTransform.eM11); aWorldTransformation.set (0, 0, aWorldTransform.eM11);
@@ -931,13 +924,6 @@ namespace cppcanvas
aWorldTransformation.set (1, 1, aWorldTransform.eM22); aWorldTransformation.set (1, 1, aWorldTransform.eM22);
aWorldTransformation.set (1, 2, aWorldTransform.eDy); 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) { if (brush->type == 4) {
aTextureTransformation.scale (brush->areaWidth, brush->areaHeight); aTextureTransformation.scale (brush->areaWidth, brush->areaHeight);
aTextureTransformation.translate (brush->areaX, brush->areaY); aTextureTransformation.translate (brush->areaX, brush->areaY);
@@ -964,7 +950,6 @@ namespace cppcanvas
aTextureTransformation.scale (100.0*nMmX/nPixX, 100.0*nMmY/nPixY); aTextureTransformation.scale (100.0*nMmX/nPixX, 100.0*nMmY/nPixY);
aTextureTransformation.translate (-nFrameLeft, -nFrameTop); aTextureTransformation.translate (-nFrameLeft, -nFrameTop);
aTextureTransformation *= rState.mapModeTransform; aTextureTransformation *= rState.mapModeTransform;
aTextureTransformation *= aBaseTransformation;
aTexture.RepeatModeX = rendering::TexturingMode::CLAMP; aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;
aTexture.RepeatModeY = rendering::TexturingMode::CLAMP; aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;

3
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -1873,9 +1873,6 @@ namespace cppcanvas
SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom); SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom);
rMF >> nPixX >> nPixY >> nMmX >> nMmY; rMF >> nPixX >> nPixY >> nMmX >> nMmY;
SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY); SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY);
rMF >> aBaseTransform;
//aWorldTransform.Set (aBaseTransform);
} }
} }
break; break;

9
vcl/source/filter/wmf/winmtf.cxx
View File

@@ -2251,15 +2251,6 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
mem << nLeft << nTop << nRight << nBottom; mem << nLeft << nTop << nRight << nBottom;
mem << mnPixX << mnPixY << mnMillX << mnMillY; 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 // need to flush the stream, otherwise GetEndOfData will return 0
// on windows where the function parameters are probably resolved in reverse order // on windows where the function parameters are probably resolved in reverse order
mem.Flush(); mem.Flush();