[1/16] gdiplus: added GdipScaleMatrix [try3]
Evan Stade
estade at gmail.com
Thu Jul 19 20:22:16 CDT 2007
Hi,
[try3] the next 4 patches explicitly initialize the float arrays
dlls/gdiplus/gdiplus.spec | 2 +-
dlls/gdiplus/matrix.c | 23 +++++++++++++++++++++++
include/gdiplusflat.h | 1 +
3 files changed, 25 insertions(+), 1 deletions(-)
--
Evan Stade
-------------- next part --------------
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 21e3828..f081ad9 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -477,7 +477,7 @@
@ stub GdipSaveImageToFile
@ stub GdipSaveImageToStream
@ stub GdipScaleLineTransform
-@ stub GdipScaleMatrix
+@ stdcall GdipScaleMatrix(ptr long long long)
@ stub GdipScalePathGradientTransform
@ stub GdipScalePenTransform
@ stub GdipScaleTextureTransform
diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c
index c8eb689..8c90211 100644
--- a/dlls/gdiplus/matrix.c
+++ b/dlls/gdiplus/matrix.c
@@ -93,6 +93,29 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(G
return Ok;
}
+GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY,
+ GpMatrixOrder order)
+{
+ REAL scale[6];
+
+ if(!matrix)
+ return InvalidParameter;
+
+ scale[0] = scaleX;
+ scale[1] = 0.0;
+ scale[2] = 0.0;
+ scale[3] = scaleY;
+ scale[4] = 0.0;
+ scale[5] = 0.0;
+
+ if(order == MatrixOrderAppend)
+ matrix_multiply(matrix->matrix, scale, matrix->matrix);
+ else
+ matrix_multiply(scale, matrix->matrix, matrix->matrix);
+
+ return Ok;
+}
+
GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts,
INT count)
{
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index e3ab4e0..16026dc 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -88,6 +88,7 @@ GpStatus WINGDIPAPI GdipTransformPath(Gp
GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**);
GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*);
GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder);
+GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);
GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT);
GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);
--
1.4.1
More information about the wine-patches
mailing list