Evan Stade : gdiplus: Added GdipCreateBitmapFromStreamICM.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Aug 1 05:16:55 CDT 2007
Module: wine
Branch: master
Commit: 3ee25cc3dfbe075a9e0b30df1f30fd75432510a4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee25cc3dfbe075a9e0b30df1f30fd75432510a4
Author: Evan Stade <estade at gmail.com>
Date: Tue Jul 31 19:16:04 2007 -0700
gdiplus: Added GdipCreateBitmapFromStreamICM.
---
dlls/gdiplus/gdiplus.spec | 2 +-
dlls/gdiplus/image.c | 13 +++++++++++++
include/gdiplusflat.h | 1 +
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 4a09aac..fb14d56 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -80,7 +80,7 @@
@ stub GdipCreateBitmapFromResource
@ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr)
@ stub GdipCreateBitmapFromStream
-@ stub GdipCreateBitmapFromStreamICM
+@ stdcall GdipCreateBitmapFromStreamICM(ptr ptr)
@ stub GdipCreateCachedBitmap
@ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr)
@ stub GdipCreateEffect
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 28d4862..1b986ae 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -97,6 +97,19 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,
return Ok;
}
+GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream,
+ GpBitmap **bitmap)
+{
+ GpStatus stat;
+
+ stat = GdipLoadImageFromStreamICM(stream, (GpImage**) bitmap);
+
+ if(stat == Ok)
+ (*bitmap)->image.type = ImageTypeBitmap;
+
+ return stat;
+}
+
GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image)
{
if(!image)
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 809868b..29ff401 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -140,6 +140,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*);
GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,
GpBitmap**);
+GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**);
GpStatus WINGDIPAPI GdipDisposeImage(GpImage*);
GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*);
GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*);
More information about the wine-cvs
mailing list