Module: wine Branch: master Commit: 492470493ec2b8f2396ab42caaa61c410d01a7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492470493ec2b8f2396ab42caa...
Author: Nikolay Sivov bunglehead@gmail.com Date: Tue Apr 29 00:10:01 2008 +0400
gdiplus: Implemented GdipDrawImage.
---
dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ include/gdiplusflat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d2baa36..a49da93 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -172,7 +172,7 @@ @ stub GdipDrawDriverString @ stub GdipDrawEllipse @ stub GdipDrawEllipseI -@ stub GdipDrawImage +@ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) @ stub GdipDrawImagePointRect diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b011ef7..4559390 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1115,6 +1115,12 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, return ret; }
+GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, REAL y) +{ + /* IPicture::Render uses LONG coords */ + return GdipDrawImageI(graphics,image,roundr(x),roundr(y)); +} + GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, INT y) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index de1125e..15ab134 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -74,6 +74,7 @@ GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit,