Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK][INCLUDE] Rename Gdiplus::Image::image as nativeImage (Retry) (#2189)

Browse source 
CORE-16585
This commit is contained in:
Katayama Hirofumi MZ 2019-12-30 14:45:26 +09:00 • committed by GitHub
parent b6e33426bf
commit d24acc9779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

95
sdk/include/psdk/gdiplusheaders.h
View file

@ -27,29 +27,29 @@ class Image : public GdiplusBase
Image(IStream *stream, BOOL useEmbeddedColorManagement = FALSE) Image(IStream *stream, BOOL useEmbeddedColorManagement = FALSE)
{ {
if (useEmbeddedColorManagement) if (useEmbeddedColorManagement)
status = DllExports::GdipLoadImageFromStreamICM(stream, &image); status = DllExports::GdipLoadImageFromStreamICM(stream, &nativeImage);
else else
status = DllExports::GdipLoadImageFromStream(stream, &image); status = DllExports::GdipLoadImageFromStream(stream, &nativeImage);
} }
Image(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE) Image(const WCHAR *filename, BOOL useEmbeddedColorManagement = FALSE)
{ {
if (useEmbeddedColorManagement) if (useEmbeddedColorManagement)
status = DllExports::GdipLoadImageFromFileICM(filename, &image); status = DllExports::GdipLoadImageFromFileICM(filename, &nativeImage);
else else
status = DllExports::GdipLoadImageFromFile(filename, &image); status = DllExports::GdipLoadImageFromFile(filename, &nativeImage);
} }
Image *Clone(VOID) Image *Clone(VOID)
{ {
Image *newImage = new Image(); Image *newImage = new Image();
SetStatus(DllExports::GdipCloneImage(image, newImage ? &newImage->image : NULL)); SetStatus(DllExports::GdipCloneImage(nativeImage, newImage ? &newImage->nativeImage : NULL));
return newImage; return newImage;
} }
virtual ~Image() virtual ~Image()
{ {
DllExports::GdipDisposeImage(image); DllExports::GdipDisposeImage(nativeImage);
} }
static Image * static Image *
@ -67,19 +67,19 @@ class Image : public GdiplusBase
Status Status
GetAllPropertyItems(UINT totalBufferSize, UINT numProperties, PropertyItem *allItems) GetAllPropertyItems(UINT totalBufferSize, UINT numProperties, PropertyItem *allItems)
{ {
return SetStatus(DllExports::GdipGetAllPropertyItems(image, totalBufferSize, numProperties, allItems)); return SetStatus(DllExports::GdipGetAllPropertyItems(nativeImage, totalBufferSize, numProperties, allItems));
} }
Status Status
GetBounds(RectF *srcRect, Unit *srcUnit) GetBounds(RectF *srcRect, Unit *srcUnit)
{ {
return SetStatus(DllExports::GdipGetImageBounds(image, srcRect, srcUnit)); return SetStatus(DllExports::GdipGetImageBounds(nativeImage, srcRect, srcUnit));
} }
Status Status
GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer) GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer)
{ {
return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetEncoderParameterList(image, return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetEncoderParameterList(nativeImage,
// clsidEncoder, size, buffer)); // clsidEncoder, size, buffer));
} }
@ -88,14 +88,14 @@ class Image : public GdiplusBase
{ {
return 0; // FIXME: not available: return 0; // FIXME: not available:
// UINT size; // UINT size;
// SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); // SetStatus(DllExports::GdipGetEncoderParameterListSize(nativeImage, clsidEncoder, &size));
// return size; // return size;
} }
UINT GetFlags(VOID) UINT GetFlags(VOID)
{ {
UINT flags; UINT flags;
SetStatus(DllExports::GdipGetImageFlags(image, &flags)); SetStatus(DllExports::GdipGetImageFlags(nativeImage, &flags));
return flags; return flags;
} }
@ -103,34 +103,34 @@ class Image : public GdiplusBase
GetFrameCount(const GUID *dimensionID) GetFrameCount(const GUID *dimensionID)
{ {
UINT count; UINT count;
SetStatus(DllExports::GdipImageGetFrameCount(image, dimensionID, &count)); SetStatus(DllExports::GdipImageGetFrameCount(nativeImage, dimensionID, &count));
return count; return count;
} }
UINT GetFrameDimensionsCount(VOID) UINT GetFrameDimensionsCount(VOID)
{ {
UINT count; UINT count;
SetStatus(DllExports::GdipImageGetFrameDimensionsCount(image, &count)); SetStatus(DllExports::GdipImageGetFrameDimensionsCount(nativeImage, &count));
return count; return count;
} }
Status Status
GetFrameDimensionsList(GUID *dimensionIDs, UINT count) GetFrameDimensionsList(GUID *dimensionIDs, UINT count)
{ {
return SetStatus(DllExports::GdipImageGetFrameDimensionsList(image, dimensionIDs, count)); return SetStatus(DllExports::GdipImageGetFrameDimensionsList(nativeImage, dimensionIDs, count));
} }
UINT GetHeight(VOID) UINT GetHeight(VOID)
{ {
UINT height; UINT height;
SetStatus(DllExports::GdipGetImageHeight(image, &height)); SetStatus(DllExports::GdipGetImageHeight(nativeImage, &height));
return height; return height;
} }
REAL GetHorizontalResolution(VOID) REAL GetHorizontalResolution(VOID)
{ {
REAL resolution; REAL resolution;
SetStatus(DllExports::GdipGetImageHorizontalResolution(image, &resolution)); SetStatus(DllExports::GdipGetImageHorizontalResolution(nativeImage, &resolution));
return resolution; return resolution;
} }
@ -142,67 +142,69 @@ class Image : public GdiplusBase
Status Status
GetPalette(ColorPalette *palette, INT size) GetPalette(ColorPalette *palette, INT size)
{ {
return SetStatus(DllExports::GdipGetImagePalette(image, palette, size)); return SetStatus(DllExports::GdipGetImagePalette(nativeImage, palette, size));
} }
INT GetPaletteSize(VOID) INT GetPaletteSize(VOID)
{ {
INT size; INT size;
SetStatus(DllExports::GdipGetImagePaletteSize(image, &size)); SetStatus(DllExports::GdipGetImagePaletteSize(nativeImage, &size));
return size; return size;
} }
Status Status
GetPhysicalDimension(SizeF *size) GetPhysicalDimension(SizeF *size)
{ {
return SetStatus( if (size)
DllExports::GdipGetImageDimension(image, size ? &size->Width : NULL, size ? &size->Height : NULL)); return SetStatus(DllExports::GdipGetImageDimension(nativeImage, &size->Width, &size->Height));
else
return SetStatus(DllExports::GdipGetImageDimension(nativeImage, NULL, NULL));
} }
PixelFormat GetPixelFormat(VOID) PixelFormat GetPixelFormat(VOID)
{ {
PixelFormat format; PixelFormat format;
SetStatus(DllExports::GdipGetImagePixelFormat(image, &format)); SetStatus(DllExports::GdipGetImagePixelFormat(nativeImage, &format));
return format; return format;
} }
UINT GetPropertyCount(VOID) UINT GetPropertyCount(VOID)
{ {
UINT numOfProperty; UINT numOfProperty;
SetStatus(DllExports::GdipGetPropertyCount(image, &numOfProperty)); SetStatus(DllExports::GdipGetPropertyCount(nativeImage, &numOfProperty));
return numOfProperty; return numOfProperty;
} }
Status Status
GetPropertyIdList(UINT numOfProperty, PROPID *list) GetPropertyIdList(UINT numOfProperty, PROPID *list)
{ {
return SetStatus(DllExports::GdipGetPropertyIdList(image, numOfProperty, list)); return SetStatus(DllExports::GdipGetPropertyIdList(nativeImage, numOfProperty, list));
} }
Status Status
GetPropertyItem(PROPID propId, UINT propSize, PropertyItem *buffer) GetPropertyItem(PROPID propId, UINT propSize, PropertyItem *buffer)
{ {
return SetStatus(DllExports::GdipGetPropertyItem(image, propId, propSize, buffer)); return SetStatus(DllExports::GdipGetPropertyItem(nativeImage, propId, propSize, buffer));
} }
UINT UINT
GetPropertyItemSize(PROPID propId) GetPropertyItemSize(PROPID propId)
{ {
UINT size; UINT size;
SetStatus(DllExports::GdipGetPropertyItemSize(image, propId, &size)); SetStatus(DllExports::GdipGetPropertyItemSize(nativeImage, propId, &size));
return size; return size;
} }
Status Status
GetPropertySize(UINT *totalBufferSize, UINT *numProperties) GetPropertySize(UINT *totalBufferSize, UINT *numProperties)
{ {
return SetStatus(DllExports::GdipGetPropertySize(image, totalBufferSize, numProperties)); return SetStatus(DllExports::GdipGetPropertySize(nativeImage, totalBufferSize, numProperties));
} }
Status Status
GetRawFormat(GUID *format) GetRawFormat(GUID *format)
{ {
return SetStatus(DllExports::GdipGetImageRawFormat(image, format)); return SetStatus(DllExports::GdipGetImageRawFormat(nativeImage, format));
} }
Image * Image *
@ -210,84 +212,85 @@ class Image : public GdiplusBase
{ {
Image *thumbImage = new Image(); Image *thumbImage = new Image();
SetStatus(DllExports::GdipGetImageThumbnail( SetStatus(DllExports::GdipGetImageThumbnail(
image, thumbWidth, thumbHeight, thumbImage ? &thumbImage->image : NULL, callback, callbackData)); nativeImage, thumbWidth, thumbHeight, thumbImage ? &thumbImage->nativeImage : NULL, callback,
callbackData));
return thumbImage; return thumbImage;
} }
ImageType GetType(VOID) ImageType GetType(VOID)
{ {
ImageType type; ImageType type;
SetStatus(DllExports::GdipGetImageType(image, &type)); SetStatus(DllExports::GdipGetImageType(nativeImage, &type));
return type; return type;
} }
REAL GetVerticalResolution(VOID) REAL GetVerticalResolution(VOID)
{ {
REAL resolution; REAL resolution;
SetStatus(DllExports::GdipGetImageVerticalResolution(image, &resolution)); SetStatus(DllExports::GdipGetImageVerticalResolution(nativeImage, &resolution));
return resolution; return resolution;
} }
UINT GetWidth(VOID) UINT GetWidth(VOID)
{ {
UINT width; UINT width;
SetStatus(DllExports::GdipGetImageWidth(image, &width)); SetStatus(DllExports::GdipGetImageWidth(nativeImage, &width));
return width; return width;
} }
Status Status
RemovePropertyItem(PROPID propId) RemovePropertyItem(PROPID propId)
{ {
return SetStatus(DllExports::GdipRemovePropertyItem(image, propId)); return SetStatus(DllExports::GdipRemovePropertyItem(nativeImage, propId));
} }
Status Status
RotateFlip(RotateFlipType rotateFlipType) RotateFlip(RotateFlipType rotateFlipType)
{ {
return SetStatus(DllExports::GdipImageRotateFlip(image, rotateFlipType)); return SetStatus(DllExports::GdipImageRotateFlip(nativeImage, rotateFlipType));
} }
Status Status
Save(IStream *stream, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) Save(IStream *stream, const CLSID *clsidEncoder, const EncoderParameters *encoderParams)
{ {
return SetStatus(DllExports::GdipSaveImageToStream(image, stream, clsidEncoder, encoderParams)); return SetStatus(DllExports::GdipSaveImageToStream(nativeImage, stream, clsidEncoder, encoderParams));
} }
Status Status
Save(const WCHAR *filename, const CLSID *clsidEncoder, const EncoderParameters *encoderParams) Save(const WCHAR *filename, const CLSID *clsidEncoder, const EncoderParameters *encoderParams)
{ {
return SetStatus(DllExports::GdipSaveImageToFile(image, filename, clsidEncoder, encoderParams)); return SetStatus(DllExports::GdipSaveImageToFile(nativeImage, filename, clsidEncoder, encoderParams));
} }
Status Status
SaveAdd(const EncoderParameters *encoderParams) SaveAdd(const EncoderParameters *encoderParams)
{ {
return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAdd(nativeImage, encoderParams));
} }
Status Status
SaveAdd(Image *newImage, const EncoderParameters *encoderParams) SaveAdd(Image *newImage, const EncoderParameters *encoderParams)
{ {
return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(image, newImage ? return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(nativeImage, newImage ?
// newImage->image : NULL, encoderParams)); // newImage->nativeImage : NULL, encoderParams));
} }
Status Status
SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) SelectActiveFrame(const GUID *dimensionID, UINT frameIndex)
{ {
return SetStatus(DllExports::GdipImageSelectActiveFrame(image, dimensionID, frameIndex)); return SetStatus(DllExports::GdipImageSelectActiveFrame(nativeImage, dimensionID, frameIndex));
} }
Status Status
SetPalette(const ColorPalette *palette) SetPalette(const ColorPalette *palette)
{ {
return SetStatus(DllExports::GdipSetImagePalette(image, palette)); return SetStatus(DllExports::GdipSetImagePalette(nativeImage, palette));
} }
Status Status
SetPropertyItem(const PropertyItem *item) SetPropertyItem(const PropertyItem *item)
{ {
return SetStatus(DllExports::GdipSetPropertyItem(image, item)); return SetStatus(DllExports::GdipSetPropertyItem(nativeImage, item));
} }
protected: protected:
@ -297,7 +300,7 @@ class Image : public GdiplusBase
private: private:
mutable Status status; mutable Status status;
GpImage *image; GpImage *nativeImage;
Status Status
SetStatus(Status status) const SetStatus(Status status) const
@ -1201,20 +1204,28 @@ class CustomLineCap : public GdiplusBase
LineCap GetBaseCap(VOID); LineCap GetBaseCap(VOID);
REAL GetBaseInset(VOID); REAL GetBaseInset(VOID);
Status GetLastStatus(VOID); Status GetLastStatus(VOID);
Status Status
GetStrokeCaps(LineCap *startCap, LineCap *endCap); GetStrokeCaps(LineCap *startCap, LineCap *endCap);
LineJoin GetStrokeJoin(VOID); LineJoin GetStrokeJoin(VOID);
REAL GetWidthScale(VOID); REAL GetWidthScale(VOID);
Status Status
SetBaseCap(LineCap baseCap); SetBaseCap(LineCap baseCap);
Status Status
SetBaseInset(REAL inset); SetBaseInset(REAL inset);
Status Status
SetStrokeCap(LineCap strokeCap); SetStrokeCap(LineCap strokeCap);
Status Status
SetStrokeCaps(LineCap startCap, LineCap endCap); SetStrokeCaps(LineCap startCap, LineCap endCap);
Status Status
SetStrokeJoin(LineJoin lineJoin); SetStrokeJoin(LineJoin lineJoin);
Status Status
SetWidthScale(IN REAL widthScale); SetWidthScale(IN REAL widthScale);