diff --git a/DesktopEditor/graphics/GraphicsPath.cpp b/DesktopEditor/graphics/GraphicsPath.cpp index 6c595af456..4f15063441 100644 --- a/DesktopEditor/graphics/GraphicsPath.cpp +++ b/DesktopEditor/graphics/GraphicsPath.cpp @@ -462,33 +462,6 @@ namespace Aggplus return Ok; } - CGraphicsPath CGraphicsPath::Trsanslate(const double& offsetX, const double& offsetY) - { - CGraphicsPath result; - result.StartFigure(); - - unsigned length = GetPointCount(); - std::vector points = GetPoints(0, length); - - for (unsigned i = 0; i < length; i++) - { - if (IsCurvePoint(i)) - { - result.CurveTo(points[i].X + offsetX, points[i].Y + offsetY, - points[i + 1].X + offsetX, points[i + 1].Y + offsetY, - points[i + 2].X + offsetX, points[i + 2].Y + offsetY); - i += 2; - } - else if (IsMovePoint(i)) - result.MoveTo(points[i].X + offsetX, points[i].Y + offsetY); - else if (IsLinePoint(i)) - result.LineTo(points[i].X + offsetX, points[i].Y + offsetY); - } - result.CloseFigure(); - - return result; - } - bool CGraphicsPath::_MoveTo(double x, double y) { if (NULL != m_internal->m_pTransform) diff --git a/DesktopEditor/graphics/GraphicsPath.h b/DesktopEditor/graphics/GraphicsPath.h index 4db6117165..a0fe6bcdeb 100644 --- a/DesktopEditor/graphics/GraphicsPath.h +++ b/DesktopEditor/graphics/GraphicsPath.h @@ -84,7 +84,6 @@ namespace Aggplus void GetBoundsAccurate(double& left, double& top, double& width, double& height) const; Status Transform(const CMatrix* matrix); - CGraphicsPath Trsanslate(const double& offsetX, const double& offsetY); virtual bool _MoveTo(double x, double y); virtual bool _LineTo(double x, double y); virtual bool _CurveTo(double x1, double y1, double x2, double y2, double x3, double y3); diff --git a/DesktopEditor/graphics/GraphicsRenderer.cpp b/DesktopEditor/graphics/GraphicsRenderer.cpp index 2fc2efdc99..25439758e9 100644 --- a/DesktopEditor/graphics/GraphicsRenderer.cpp +++ b/DesktopEditor/graphics/GraphicsRenderer.cpp @@ -648,12 +648,6 @@ HRESULT CGraphicsRenderer::BrushRect(const INT& val, const double& left, const d m_oBrush.Rect.Height = (float)height; return S_OK; } -HRESULT CGraphicsRenderer::get_BrushRect(Aggplus::RectF& rect, bool& rectable) const -{ - rectable = m_oBrush.Rectable; - rect = m_oBrush.Rect; - return S_OK; -} HRESULT CGraphicsRenderer::BrushBounds(const double& left, const double& top, const double& width, const double& height) { m_oBrush.Bounds.left = left; diff --git a/DesktopEditor/graphics/GraphicsRenderer.h b/DesktopEditor/graphics/GraphicsRenderer.h index 7b01b307f2..2b3185bd5f 100644 --- a/DesktopEditor/graphics/GraphicsRenderer.h +++ b/DesktopEditor/graphics/GraphicsRenderer.h @@ -194,7 +194,6 @@ public: virtual HRESULT get_BrushScale(bool& isScale, double& scaleX, double& scaleY) const; virtual HRESULT put_BrushScale(bool isScale, const double& scaleX, const double& scaleY); virtual HRESULT BrushRect(const INT& val, const double& left, const double& top, const double& width, const double& height); - virtual HRESULT get_BrushRect(Aggplus::RectF& rect, bool& rectable) const; virtual HRESULT BrushBounds(const double& left, const double& top, const double& width, const double& height); virtual HRESULT put_BrushGradientColors(LONG* lColors, double* pPositions, LONG nCount); diff --git a/DesktopEditor/graphics/IRenderer.h b/DesktopEditor/graphics/IRenderer.h index cbb0dc9338..f3bfa594db 100644 --- a/DesktopEditor/graphics/IRenderer.h +++ b/DesktopEditor/graphics/IRenderer.h @@ -247,7 +247,6 @@ public: virtual HRESULT get_BrushScale(bool& isScale, double& scaleX, double& scaleY) const = 0; virtual HRESULT put_BrushScale(bool isScale, const double& scaleX, const double& scaleY) = 0; virtual HRESULT BrushRect(const INT& val, const double& left, const double& top, const double& width, const double& height) = 0; - virtual HRESULT get_BrushRect(Aggplus::RectF& rect, bool& rectable) const = 0; virtual HRESULT BrushBounds(const double& left, const double& top, const double& width, const double& height) = 0; virtual HRESULT put_BrushGradientColors(LONG* lColors, double* pPositions, LONG nCount) = 0; diff --git a/DesktopEditor/graphics/aggplustypes.h b/DesktopEditor/graphics/aggplustypes.h index 0ff943aac0..fc10bd1033 100644 --- a/DesktopEditor/graphics/aggplustypes.h +++ b/DesktopEditor/graphics/aggplustypes.h @@ -210,8 +210,7 @@ public: } void Offset(const PointF_T& point) { Offset(point.X, point.Y); } - void Offset(const T& dx, const T& dy) { X += dx; Y += dy; } - void Scale(const T& sx, const T& sy) { Width *= sx; Height *= sy; } + void Offset(T dx, T dy) { X += dx; Y += dy; } RectF_T& operator=(const RectF_T& other) {