Changeset 703 for trunk

Timestamp:

Apr 7, 2009, 9:35:42 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Imageクラスを追加
(#242)

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/System/Drawing/Graphics.ab (modified) (2 diffs)
• Classes/System/Drawing/Image.ab (modified) (2 diffs)
• Classes/System/Drawing/Imaging/misc.ab (modified) (2 diffs)
• GdiPlus.ab (modified) (1 diff)
• GdiPlusFlat.ab (modified) (3 diffs)
• basic/function.sbp (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/Drawing/Graphics.ab

@@ -230 +230 @@
         End If
         Dim graphics = 0 As *GpGraphics
-        SetStatus(GdipGetImageGraphicsContext(image.nativeImage, graphics))
+        SetStatus(GdipGetImageGraphicsContext(image.NativeImage, graphics))
         Return New Graphics(graphics)
     End Function
@@ -1237 +1237 @@
             getNativeImage = 0
         Else
-            getNativeImage = image.nativeImage
+            getNativeImage = image.NativeImage
         End If
     End Function

trunk/ab5.0/ablib/src/Classes/System/Drawing/Image.ab

@@ -5 +5 @@
 
 Class Image
+    Implements IDisposable, ICloneable
 Public
     Sub Image(native As *GpImage)
@@ -10 +11 @@
     End Sub
 
+    ' FromNativeImage推奨
     Function NativeImage() As *GpImage
-        Return nativeImage
-    End Function
-'Private
+        NativeImage = nativeImage
+    End Function
+
+    Static Function FromFile(filename As PCWSTR, useEmbeddedColorManagement = False As Boolean) As Image
+        Dim native As *GpImage
+        If useEmbeddedColorManagement Then
+            SetStatus(GdipLoadImageFromFileICM(filename, native))
+        Else
+            SetStatus(GdipLoadImageFromFile(filename, native))
+        End If
+        FromFile = FromNativeImage(native)
+    End Function
+
+'   Static Function FromComStream(stream As IStream, useEmbeddedColorManagement = False As Boolean) As Image
+'       Dim native As *GpImage
+'       If useEmbeddedColorManagement Then
+'           SetStatus(GdipLoadImageFromStreamICM(stream, native))
+'       Else
+'           SetStatus(GdipLoadImageFromStream(stream, native))
+'       End If
+'       FromComStream = FromNativeImage(native)
+'   End Function
+
+'   Static Function FromABStream(stream As IO.Stream, useEmbeddedColorManagement = False As Boolean) As Image
+'       Dim comStream = ComStreamFromABStream(stream)
+'       Try
+'           FromABStream = New FromComStream(comStream)
+'       Finally
+'           comStream.Release()
+'       End Try
+'   End Function
+
+    Static Function FromNativeImage(native As *GpImage) As Image
+        Dim imageType = ImageTypeUnknown As ImageType
+        SetStatus(GdipGetImageType(nativeImage, imageType))
+        Select Case imageType
+'           Case ImageTypeBitmap
+'               FromNativeImage = New Bitmap(native)
+'           Case ImageTypeMetafile
+'               FromNativeImage = New Metafile(native)
+            Case Else
+                FromNativeImage = New Image(native)
+        End Select
+    End Function
+
+    Sub Dispose()
+        If nativeImage <> 0 Then
+            GdipDisposeImage(nativeImage)
+        End If
+        nativeImage = 0
+    End Sub
+
+    Sub ~Image()
+        Dispose()
+    End Sub
+
+    Function Clone() As Image
+        Dim cloned As *GpImage
+        SetStatus(GdipCloneImage(nativeImage, cloned))
+        Clone = FromNativeImage(cloned)
+    End Function
+
+    Sub Save(filename As PCWSTR, format As Imaging.ImageFormat)
+        SaveImpl(filename, format.Guid)
+    End Sub
+/*
+    Sub Save(stream As IStream, format As Imaging.ImageFormat)
+        SaveImpl(stream, format.Guid)
+    End Sub
+
+    Sub Save(stream As IO.Stream, format As Imaging.ImageFormat)
+        SaveImpl(stream, format.Guid)
+    End Sub
+*/
+    Sub Save(filename As PCWSTR, encoder As Imaging.ImageCodecInfo, encoderParams As Imaging.EncoderParameters)
+        SaveImpl(filename, encoder.Clsid, ToNativeEncoderParameters(encoderParams))
+    End Sub
+/*
+    Sub Save(stream As IO.Stream, encoder As Imaging.ImageCodecInfo, encoderParams As Imaging.EncoderParameters)
+        SaveImpl(stream, encoder.Clsid, ToNativeEncoderParameters(encoderParams))
+    End Sub
+
+    Sub Save(stream As IStream, encoder As Imaging.ImageCodecInfo, encoderParams As Imaging.EncoderParameters)
+        SaveImpl(stream, encoder.Clsid, ToNativeEncoderParameters(encoderParams))
+    End Sub
+*/
+Private
+    Static Function ToNativeEncoderParameters(encoderParams As Imaging.EncoderParameters) As *Gdiplus.EncoderParameters
+        If ActiveBasic.IsNothing(encoderParams) Then
+            ToNativeEncoderParameters = 0
+        Else
+            ToNativeEncoderParameters = encoderParams.Params
+        End If
+    End Function
+
+    Sub SaveImpl(filename As PCWSTR, ByRef clsidEncoder As CLSID, encoderParams = 0 As *Gdiplus.EncoderParameters)
+        SetStatus(GdipSaveImageToFile(nativeImage, filename, clsidEncoder, encoderParams))
+    End Sub
+/*
+    Sub SaveImpl(stream As IStream, ByRef clsidEncoder As CLSID, encoderParams = 0 As *Gdiplus.EncoderParameters)
+        SetStatus(GdipSaveImageToStream(stream, clsidEncoder, encoderParams)
+    End Sub
+*/
+Public
+    Sub SaveAdd(encoderParams As Imaging.EncoderParameters)
+        SetStatus(GdipSaveAdd(nativeImage, ByVal ToNativeEncoderParameters(encoderParams)))
+    End Sub
+
+    Sub SaveAdd(newImage As Image, encoderParams As Imaging.EncoderParameters)
+        If ActiveBasic.IsNothing(newImage) Then
+            Throw New ArgumentNullException("newImage")
+        End If
+        SetStatus(GdipSaveAddImage(nativeImage, newImage.NativeImage, ByVal ToNativeEncoderParameters(encoderParams)))
+    End Sub
+
+    Function PhysicalDimension() As SizeF
+        With PhysicalDimension
+            SetStatus(GdipGetImageDimension(nativeImage, .Width, .Height))
+        End With
+    End Function
+/*
+    Function GetBounds(pageUnit As GraphicsUnit) As RectangleF
+        SetStatus(GdipGetImageBounds(nativeImage, pageUnit, GetBounds))
+    End Function
+*/
+    Function Width() As DWord
+        SetStatus(GdipGetImageWidth(nativeImage, Width))
+    End Function
+
+    Function Height() As DWord
+        SetStatus(GdipGetImageHeight(nativeImage, Height))
+    End Function
+
+    Function Size() As Size
+        Size.Width = This.Width
+        Size.Height = This.Height
+    End Function
+
+    Function HorizontalResolution() As Single
+        SetStatus(GdipGetImageHorizontalResolution(nativeImage, HorizontalResolution))
+    End Function
+
+    Function VerticalResolution() As Single
+        SetStatus(GdipGetImageVerticalResolution(nativeImage, VerticalResolution))
+    End Function
+
+    Function Flags() As DWord
+        SetStatus(GdipGetImageFlags(nativeImage, Height))
+    End Function
+/*
+    Status GetRawFormat(OUT GUID *format);
+*/
+'   Function PixelFormat() As Imaging.PixelFormat
+'       SetStatus(GdipGetImagePixelFormat(nativeImage, PixelFormat))
+'   End Function
+
+    ' Palette - GetPaletteSize/GetPalette/SetPalette
+/*
+    Image* GetThumbnailImage(IN UINT thumbWidth,
+                             IN UINT thumbHeight,
+                             IN GetThumbnailImageAbort callback = NULL,
+                             IN VOID* callbackData = NULL);
+*/
+    ' FrameDimensionsList - GetFrameDimensionsCount/GetFrameDimensionsList
+    ' GetFrameCount
+    ' SelectActiveFrame
+
+    Sub RotateFlip(rotateFlipType As RotateFlipType)
+        SetStatus(GdipImageRotateFlip(nativeImage, rotateFlipType))
+    End Sub
+
+    ' PropertyIdList - GetPropertyCount/GetPropertyIdList
+    ' GetPropertyItem - GetPropertyItemSize/GetPropertyItem
+    ' PropertyItems - GetPropertySize/GetAllPropertyItems
+    ' RemovePropertyItem
+    ' SetPropertyItem
+    ' GetEncoderParameterList - GetEncoderParameterList/GetEncoderParameterListSize
+
+Private
     nativeImage As *GpImage
 End Class
 
+Namespace Imaging
+Class ImageCodecInfo
+Public
+    Sub ImageCodecInfo(ByRef nativeImageCodecInfo As Gdiplus.ImageCodecInfo)
+        ici = nativeImageCodecInfo
+    End Sub
+    
+    Function Clsid() As CLSID
+        Clsid = ici.FormatID
+    End Function
+
+    Function FormatID() As GUID
+        FormatID = ici.FormatID
+    End Function
+
+    Function CodecName() As String
+        CodecName =  New String(ici.CodecName)
+    End Function
+
+    Function DllName() As String
+        DllName = New String(ici.DllName)
+    End Function
+
+    Function FormatDescription() As String
+        FormatDescription =  New String(ici.FormatDescription)
+    End Function
+
+    Function FilenameExtension() As String
+        FilenameExtension =  New String(ici.FilenameExtension)
+    End Function
+
+'   Function Flags() As ImageCodecFlags
+'       Flags = ici.Flags
+'   End Function
+
+    Function Version() As DWord
+        Version = ici.Version
+    End Function
+
+    ' SignaturePatterns
+    ' SignatureMasks
+
+    Static Function GetImageDecoders() As Collections.Generic.IEnumerable<ImageCodecInfo>
+        Dim num As DWord
+        Dim bufSize As DWord
+        SetStatus(GdipGetImageDecodersSize(num, bufSize))
+        Dim pici = GC_malloc_atomic(bufSize) As *Gdiplus.ImageCodecInfo
+        SetStatus(GdipGetImageDecoders(num, bufSize, pici))
+        GetImageDecoders = ImageCodecInfoPtrToEnumerable(pici, num)
+    End Function
+
+    Static Function GetImageEncoders() As Collections.Generic.IEnumerable<ImageCodecInfo>
+        Dim num As DWord
+        Dim bufSize As DWord
+        SetStatus(GdipGetImageEncodersSize(num, bufSize))
+        Dim pici = GC_malloc_atomic(bufSize) As *Gdiplus.ImageCodecInfo
+        SetStatus(GdipGetImageEncoders(num, bufSize, pici))
+        GetImageEncoders = ImageCodecInfoPtrToEnumerable(pici, num)
+    End Function
+
+Private
+    Static Function ImageCodecInfoPtrToEnumerable(pici As *Gdiplus.ImageCodecInfo, n As DWord) As Collections.Generic.IEnumerable<ImageCodecInfo>
+        Dim l = New Collections.Generic.List<ImageCodecInfo>(n)
+        Dim i As DWord
+        For i = 0 To ELM(n)
+            l.Add(New ImageCodecInfo(pici[i]))
+        Next
+        Dim il = l As Collections.Generic.IList<ImageCodecInfo>
+        ImageCodecInfoPtrToEnumerable = il
+    End Function
+
+    ici As Gdiplus.ImageCodecInfo
+End Class
+
+Class ImageFormat
+Public
+    Function Guid() As GUID
+        Guid = guid
+    End Function
+
+    Override Function Equals(y As Object) As Boolean
+        If This.GetType().Equals(y.GetType()) Then
+            Dim yi = y As ImageFormat
+            Equals = IsEqualGUID(This.guid, yi.guid) As Boolean
+        Else
+            Equals = False
+        End If
+    End Function
+
+    Override Function GetHashCode() As Long
+        GetHashCode = _System_HashFromGUID(guid)
+    End Function
+
+    Static Function MemoryBmp() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatMemoryBMP)
+    End Function
+
+    Static Function Bmp() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatBMP)
+    End Function
+
+    Static Function Emf() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatEMF)
+    End Function
+
+    Static Function Wmf() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatWMF)
+    End Function
+
+    Static Function Jpeg() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatJPEG)
+    End Function
+
+    Static Function Png() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatPNG)
+    End Function
+
+    Static Function Gif() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatGIF)
+    End Function
+
+    Static Function Tiff() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatTIFF)
+    End Function
+
+    Static Function Exif() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatEXIF)
+    End Function
+
+    Static Function Icon() As ImageFormat
+        Return New ImageFormat(Gdiplus.ImageFormatIcon)
+    End Function
+
+Private
+    Sub ImageFormat(ByRef codecGuid As GUID)
+        guid = codecGuid
+    End Sub
+
+    guid As GUID
+End Class
+
+Class EncoderParameters
+Public
+    Sub EncoderParameters()
+        init(1)
+    End Sub
+
+    Sub EncoderParameters(n As Long)
+        init(n)
+    End Sub
+
+    Function Params() As *EncoderParameter
+        Params = eps->Parameter
+    End Function
+Private
+    Sub init(n As Long)
+        Dim size = SizeOf (Gdiplus.EncoderParameters) + SizeOf (EncoderParameter) * n
+        eps = GC_malloc(size)
+        ZeroMemory(eps, size)
+        eps->Count = n
+    End Sub
+
+    eps As *Gdiplus.EncoderParameters
+End Class
+End Namespace
+
 End Namespace
 End Namespace
+
+Namespace Gdiplus
+
+Type ImageCodecInfo
+    Clsid As CLSID
+    FormatID As GUID
+    CodecName As PCWSTR
+    DllName As PCWSTR
+    FormatDescription As PCWSTR
+    FilenameExtension As PCWSTR
+    MimeType As PCWSTR
+    Flags As DWord
+    Version As DWord
+    SigCount As DWord
+    SigSize As DWord
+    SigPattern As *Byte
+    SigMask As *Byte
+End Type
+
+Type Align(8) EncoderParameters
+    Count As DWord
+    Parameter[0] As System.Drawing.Imaging.EncoderParameter
+End Type
+
+End Namespace

trunk/ab5.0/ablib/src/Classes/System/Drawing/Imaging/misc.ab

@@ -133 +133 @@
     EncoderType As DWord '元はTypeという名前
     Value As VoidPtr
-End Type
-
-Type Align(8) EncoderParameters
-    Count As DWord
-    Parameter[0] As EncoderParameter
 End Type
 
@@ -411 +406 @@
 Const PropertyTagGpsDestDistRef     = &h0019
 Const PropertyTagGpsDestDist        = &h001A
-
-Type ImageCodecInfo
-    Clsid As CLSID
-    FormatID As GUID
-    CodecName As PCWSTR
-    DllName As PCWSTR
-    FormatDescription As PCWSTR
-    FilenameExtension As PCWSTR
-    MimeType As PCWSTR
-    Flags As DWord
-    Version As DWord
-    SigCount As DWord
-    SigSize As DWord
-    SigPattern As *Byte
-    SigMask As DWord
-End Type
 
 Enum ColorChannelFlag

trunk/ab5.0/ablib/src/GdiPlus.ab

@@ -14 +14 @@
 '#require <Classes/System/Drawing/Imaging/misc.ab>
 '#require <Classes/System/Drawing/Imaging/MetafileHeader.ab>
+
+' GdiPlusImaging.ab
+
+Namespace Gdiplus
+Dim ImageFormatUndefined = [&hb96b3ca9, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatMemoryBMP = [&hb96b3caa, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatBMP = [&hb96b3cab, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatEMF = [&hb96b3cac, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatWMF = [&hb96b3cad, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatJPEG = [&hb96b3cae, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatPNG = [&hb96b3caf, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatGIF = [&hb96b3cb0, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatTIFF = [&hb96b3cb1, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatEXIF = [&hb96b3cb2, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+Dim ImageFormatIcon = [&hb96b3cb5, &h0728, &h11d3, [&h9d, &h7b, &h00, &h00, &hf8, &h1e, &hf3, &h2e]] As GUID
+
+Dim FrameDimensionTime = [&h6aedbd6d, &h3fb5, &h418a, [&h83, &ha6, &h7f, &h45, &h22, &h9d, &hc8, &h72]] As GUID
+Dim FrameDimensionResolution = [&h84236f7b, &h3bd3, &h428f, [&h8d, &hab, &h4e, &ha1, &h43, &h9c, &ha3, &h15]] As GUID
+Dim FrameDimensionPage = [&h7462dc86, &h6180, &h4c7e, [&h8e, &h3f, &hee, &h73, &h33, &ha7, &ha4, &h83]] As GUID
+
+Dim FormatIDImageInformation = [&he5836cbe, &h5eef, &h4f1d, [&hac, &hde, &hae, &h4c, &h43, &hb6, &h08, &hce]] As GUID
+Dim FormatIDJpegAppHeaders = [&h1c4afdcd, &h6177, &h43cf, [&hab, &hc7, &h5f, &h51, &haf, &h39, &hee, &h85]] As GUID
+
+Dim EncoderCompression = [&he09d739d, &hccd4, &h44ee, [&h8e, &hba, &h3f, &hbf, &h8b, &he4, &hfc, &h58]] As GUID
+Dim EncoderColorDepth = [&h66087055, &had66, &h4c7c, [&h9a, &h18, &h38, &ha2, &h31, &h0b, &h83, &h37]] As GUID
+Dim EncoderScanMethod = [&h3a4e2661, &h3109, &h4e56, [&h85, &h36, &h42, &hc1, &h56, &he7, &hdc, &hfa]] As GUID
+Dim EncoderVersion = [&h24d18c76, &h814a, &h41a4, [&hbf, &h53, &h1c, &h21, &h9c, &hcc, &hf7, &h97]] As GUID
+Dim EncoderRenderMethod = [&h6d42c53a, &h229a, &h4825, [&h8b, &hb7, &h5c, &h99, &he2, &hb9, &ha8, &hb8]] As GUID
+Dim EncoderQuality = [&h1d5be4b5, &hfa4a, &h452d, [&h9c, &hdd, &h5d, &hb3, &h51, &h05, &he7, &heb]] As GUID
+Dim EncoderTransformation = [&h8d0eb2d1, &ha58e, &h4ea8, [&haa, &h14, &h10, &h80, &h74, &hb7, &hb6, &hf9]] As GUID
+Dim EncoderLuminanceTable = [&hedb33bce, &h0266, &h4a77, [&hb9, &h04, &h27, &h21, &h60, &h99, &he7, &h17]] As GUID
+Dim EncoderChrominanceTable = [&hf2e455dc, &h09b3, &h4316, [&h82, &h60, &h67, &h6a, &hda, &h32, &h48, &h1c]] As GUID
+Dim EncoderSaveFlag = [&h292266fc, &hac40, &h47bf, [&h8c, &hfc, &ha8, &h5b, &h89, &ha6, &h55, &hde]] As GUID
+
+'#if GDIPVER >= &h0110
+Dim EncoderColorSpace = [&hae7a62a0, &hee2c, &h49d8, [&h9d, &h7, &h1b, &ha8, &ha9, &h27, &h59, &h6e]] As GUID
+Dim EncoderImageItems = [&h63875e13, &h1f1d, &h45ab, [&h91, &h95, &ha2, &h9b, &h60, &h66, &ha6, &h50]] As GUID
+Dim EncoderSaveAsCMYK = [&ha219bbc9,  &ha9d,  &h4005, [ &ha3, &hee, &h3a, &h42, &h1b, &h8b, &hb0, &h6c]] As GUID
+'#endif
+
+Dim CodecIImageBytes = [&h025d1823, &h6c7d, &h447b, [&hbb, &hdb, &ha3, &hcb, &hc3, &hdf, &ha2, &hfc]] As GUID
+End Namespace

trunk/ab5.0/ablib/src/GdiPlusFlat.ab

@@ -336 +336 @@
 Declare Function GdipCloneImage Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef cloneImage As *GpImage) As GpStatus
 Declare Function GdipDisposeImage Lib "gdiplus.dll" (ByVal image As *GpImage) As GpStatus
-Declare Function GdipSaveImageToFile Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal filename As PCWSTR, ByRef clsidEncoder As CLSID, ByRef encoderParams As System.Drawing.Imaging.EncoderParameters) As GpStatus
-Declare Function GdipSaveImageToStream Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal stream As *IStream, ByRef clsidEncoder As CLSID, ByRef encoderParams As System.Drawing.Imaging.EncoderParameters) As GpStatus
-Declare Function GdipSaveAdd Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef encoderParams As System.Drawing.Imaging.EncoderParameters) As GpStatus
-Declare Function GdipSaveAddImage Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal newImage As *GpImage, ByRef encoderParams As System.Drawing.Imaging.EncoderParameters) As GpStatus
+Declare Function GdipSaveImageToFile Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal filename As PCWSTR, ByRef clsidEncoder As CLSID, ByVal encoderParams As *Gdiplus.EncoderParameters) As GpStatus
+Declare Function GdipSaveImageToStream Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal stream As *IStream, ByRef clsidEncoder As CLSID, ByVal encoderParams As *Gdiplus.EncoderParameters) As GpStatus
+Declare Function GdipSaveAdd Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef encoderParams As Gdiplus.EncoderParameters) As GpStatus
+Declare Function GdipSaveAddImage Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal newImage As *GpImage, ByRef encoderParams As Gdiplus.EncoderParameters) As GpStatus
 Declare Function GdipGetImageGraphicsContext Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef graphics As *GpGraphics) As GpStatus
 Declare Function GdipGetImageBounds Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef srcRect As GpRectF, ByRef srcUnit As GpUnit) As GpStatus
@@ -353 +353 @@
 Declare Function GdipGetImageThumbnail Lib "gdiplus.dll" (ByVal image As *GpImage, ByVal thumbWidth As DWord, ByVal thumbHeight As DWord, ByRef thumbImage As *GpImage, ByVal callback As GetThumbnailImageAbort, ByVal callbackData As VoidPtr) As GpStatus
 Declare Function GdipGetEncoderParameterListSize Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef clsidEncoder As CLSID, ByRef size As DWord) As GpStatus
-Declare Function GdipGetEncoderParameterList Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef clsidEncoder As CLSID, ByVal size As DWord, ByRef buffer As System.Drawing.Imaging.EncoderParameters) As GpStatus
+Declare Function GdipGetEncoderParameterList Lib "gdiplus.dll" (ByVal image As *GpImage, ByRef clsidEncoder As CLSID, ByVal size As DWord, ByRef buffer As Gdiplus.EncoderParameters) As GpStatus
 Declare Function GdipImageGetFrameDimensionsCount Lib "gdiplus.dll" (ByRef image As *GpImage, ByRef count As DWord) As GpStatus
 Declare Function GdipImageGetFrameDimensionsList Lib "gdiplus.dll" (ByRef image As *GpImage, ByVal dimensionIDs As *GUID, ByVal count As DWord) As GpStatus
@@ -577 +577 @@
 Declare Function GdipGetMetafileDownLevelRasterizationLimit Lib "gdiplus.dll" (ByVal metafile As *GpMetafile, ByRef metafileRasterizationLimitDpi As DWord) As GpStatus
 Declare Function GdipGetImageDecodersSize Lib "gdiplus.dll" (ByRef numDecoders As DWord, ByRef size As DWord) As GpStatus
-Declare Function GdipGetImageDecoders Lib "gdiplus.dll" (ByVal numDecoders As DWord, ByVal size As DWord, ByVal decoders As *System.Drawing.Imaging.ImageCodecInfo) As GpStatus
+Declare Function GdipGetImageDecoders Lib "gdiplus.dll" (ByVal numDecoders As DWord, ByVal size As DWord, ByVal decoders As *Gdiplus.ImageCodecInfo) As GpStatus
 Declare Function GdipGetImageEncodersSize Lib "gdiplus.dll" (ByRef numDecoders As DWord, ByRef size As DWord) As GpStatus
-Declare Function GdipGetImageEncoders Lib "gdiplus.dll" (ByVal numEncoders As DWord, ByVal size As DWord, ByVal encoderss As *System.Drawing.Imaging.ImageCodecInfo) As GpStatus
+Declare Function GdipGetImageEncoders Lib "gdiplus.dll" (ByVal numEncoders As DWord, ByVal size As DWord, ByVal encoderss As *Gdiplus.ImageCodecInfo) As GpStatus
 Declare Function GdipComment Lib "gdiplus.dll" (ByVal graphics As *GpGraphics, ByVal sizeData As DWord, ByVal data As *Byte) As GpStatus
 

trunk/ab5.0/ablib/src/basic/function.sbp

@@ -905 +905 @@
 End Function
 
+Function _System_HashFromGUID(ByRef guid As GUID) As Long
+    Dim p = VarPtr(guid) As *DWord
+    _System_HashFromGUID = (p[0] Xor p[1] Xor p[2] Xor p[3]) As Long
+End Function
+
 /*!
 @brief  ObjPtrの逆。ABオブジェクトを指すポインタをObject型へ変換。