Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 22:18:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK][INCLUDE] Improve gdiplusmatrix.h (#2220)

Browse source 
CORE-16585
This commit is contained in:
Katayama Hirofumi MZ 2020-01-01 16:48:52 +09:00 committed by GitHub
parent cc60a2125a
commit f48a01324c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
sdk/include/psdk/gdiplusmatrix.h
View file

@ -50,7 +50,7 @@ class Matrix : public GdiplusBase
} }
Matrix * Matrix *
Clone() Clone() const
{ {
GpMatrix *cloneMatrix = NULL; GpMatrix *cloneMatrix = NULL;
SetStatus(DllExports::GdipCloneMatrix(nativeMatrix, &cloneMatrix)); SetStatus(DllExports::GdipCloneMatrix(nativeMatrix, &cloneMatrix));
@ -58,7 +58,11 @@ class Matrix : public GdiplusBase
if (lastStatus != Ok) if (lastStatus != Ok)
return NULL; return NULL;
return new Matrix(cloneMatrix); Matrix *newMatrix = new Matrix(cloneMatrix);
if (!newMatrix)
DllExports::GdipDeleteMatrix(cloneMatrix);
return newMatrix;
} }
~Matrix() ~Matrix()
@ -67,7 +71,7 @@ class Matrix : public GdiplusBase
} }
BOOL BOOL
Equals(const Matrix *matrix) Equals(const Matrix *matrix) const
{ {
BOOL result; BOOL result;
SetStatus(DllExports::GdipIsMatrixEqual(nativeMatrix, matrix ? getNat(matrix) : NULL, &result)); SetStatus(DllExports::GdipIsMatrixEqual(nativeMatrix, matrix ? getNat(matrix) : NULL, &result));
@ -93,7 +97,7 @@ class Matrix : public GdiplusBase
} }
BOOL BOOL
IsIdentity() IsIdentity() const
{ {
BOOL result; BOOL result;
SetStatus(DllExports::GdipIsMatrixIdentity(nativeMatrix, &result)); SetStatus(DllExports::GdipIsMatrixIdentity(nativeMatrix, &result));
@ -101,7 +105,7 @@ class Matrix : public GdiplusBase
} }
BOOL BOOL
IsInvertible() IsInvertible() const
{ {
BOOL result; BOOL result;
SetStatus(DllExports::GdipIsMatrixInvertible(nativeMatrix, &result)); SetStatus(DllExports::GdipIsMatrixInvertible(nativeMatrix, &result));
@ -109,40 +113,60 @@ class Matrix : public GdiplusBase
} }
Status Status
Multiply(const Matrix *matrix, MatrixOrder order) Multiply(const Matrix *matrix, MatrixOrder order = MatrixOrderPrepend)
{ {
return SetStatus(DllExports::GdipMultiplyMatrix(nativeMatrix, matrix ? getNat(matrix) : NULL, order)); return SetStatus(DllExports::GdipMultiplyMatrix(nativeMatrix, matrix ? getNat(matrix) : NULL, order));
} }
REAL OffsetX(VOID) REAL
OffsetX() const
{ {
return 0; REAL elements[6];
if (GetElements(elements) == Ok)
return elements[4];
return 0.0f;
} }
REAL OffsetY(VOID) REAL
OffsetY() const
{ {
return 0; REAL elements[6];
} if (GetElements(elements) == Ok)
return elements[5];
Status Reset(VOID) return 0.0f;
{
return NotImplemented;
} }
Status Status
Rotate(REAL angle, MatrixOrder order) Reset()
{
return SetStatus(DllExports::GdipSetMatrixElements(nativeMatrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0));
}
Status
Rotate(REAL angle, MatrixOrder order = MatrixOrderPrepend)
{ {
return SetStatus(DllExports::GdipRotateMatrix(nativeMatrix, angle, order)); return SetStatus(DllExports::GdipRotateMatrix(nativeMatrix, angle, order));
} }
Status Status
RotateAt(REAL angle, const PointF &center, MatrixOrder order) RotateAt(REAL angle, const PointF &center, MatrixOrder order = MatrixOrderPrepend)
{ {
return NotImplemented; if (order == MatrixOrderPrepend)
{
SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, center.X, center.Y, order));
SetStatus(DllExports::GdipRotateMatrix(nativeMatrix, angle, order));
return SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, -center.X, -center.Y, order));
}
else
{
SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, -center.X, -center.Y, order));
SetStatus(DllExports::GdipRotateMatrix(nativeMatrix, angle, order));
return SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, center.X, center.Y, order));
}
} }
Status Status
Scale(REAL scaleX, REAL scaleY, MatrixOrder order) Scale(REAL scaleX, REAL scaleY, MatrixOrder order = MatrixOrderPrepend)
{ {
return SetStatus(DllExports::GdipScaleMatrix(nativeMatrix, scaleX, scaleY, order)); return SetStatus(DllExports::GdipScaleMatrix(nativeMatrix, scaleX, scaleY, order));
} }
@ -154,7 +178,7 @@ class Matrix : public GdiplusBase
} }
Status Status
Shear(REAL shearX, REAL shearY, MatrixOrder order) Shear(REAL shearX, REAL shearY, MatrixOrder order = MatrixOrderPrepend)
{ {
return SetStatus(DllExports::GdipShearMatrix(nativeMatrix, shearX, shearY, order)); return SetStatus(DllExports::GdipShearMatrix(nativeMatrix, shearX, shearY, order));
} }
@ -184,7 +208,7 @@ class Matrix : public GdiplusBase
} }
Status Status
Translate(REAL offsetX, REAL offsetY, MatrixOrder order) Translate(REAL offsetX, REAL offsetY, MatrixOrder order = MatrixOrderPrepend)
{ {
return SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, offsetX, offsetY, order)); return SetStatus(DllExports::GdipTranslateMatrix(nativeMatrix, offsetX, offsetY, order));
} }