EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it
Change-Id: Ifa4f42c4f17a70c7238347a13897ef6742eb4679
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user