Changeset 704 for trunk

Timestamp:

Apr 8, 2009, 1:01:10 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

Bitmapクラスの追加
(#242)

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/System/Drawing/Bitmap.ab (added)
• Classes/System/Drawing/Image.ab (modified) (4 diffs)
• GdiPlusFlat.ab (modified) (1 diff)

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

@@ -14 +14 @@
     Function NativeImage() As *GpImage
         NativeImage = nativeImage
+    End Function
+
+    Static Function FromFile(filename As String, useEmbeddedColorManagement = False As Boolean) As Image
+        FromFile = FromFile(ToWCStr(filename), useEmbeddedColorManagement)
     End Function
 
@@ -49 +53 @@
         SetStatus(GdipGetImageType(nativeImage, imageType))
         Select Case imageType
-'           Case ImageTypeBitmap
-'               FromNativeImage = New Bitmap(native)
+            Case ImageTypeBitmap
+                FromNativeImage = New Bitmap(native)
 '           Case ImageTypeMetafile
 '               FromNativeImage = New Metafile(native)
@@ -75 +79 @@
     End Function
 
+    Sub Save(filename As String, format As Imaging.ImageFormat)
+        SaveImpl(ToWCStr(filename), format.Guid)
+    End Sub
+
     Sub Save(filename As PCWSTR, format As Imaging.ImageFormat)
         SaveImpl(filename, format.Guid)
@@ -87 +95 @@
     End Sub
 */
+    Sub Save(filename As String, encoder As Imaging.ImageCodecInfo, encoderParams As Imaging.EncoderParameters)
+        SaveImpl(ToWCStr(filename), encoder.Clsid, ToNativeEncoderParameters(encoderParams))
+    End Sub
+
     Sub Save(filename As PCWSTR, encoder As Imaging.ImageCodecInfo, encoderParams As Imaging.EncoderParameters)
         SaveImpl(filename, encoder.Clsid, ToNativeEncoderParameters(encoderParams))

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

@@ -388 +388 @@
 Declare Function GdipCloneBitmapArea Lib "gdiplus.dll" (ByVal x As Single, ByVal y As Single, ByVal width As Single, ByVal height As Single, ByVal format As Long /*PixelFormat*/, ByVal srcBitmap As *GpBitmap, ByRef dstBitmap As *GpBitmap) As GpStatus
 Declare Function GdipCloneBitmapAreaI Lib "gdiplus.dll" (ByVal x As Long, ByVal y As Long, ByVal width As Long, ByVal height As Long, ByVal format As Long /*PixelFormat*/, ByVal srcBitmap As *GpBitmap, ByRef dstBitmap As *GpBitmap) As GpStatus
-Declare Function GdipBitmapLockBits Lib "gdiplus.dll" (ByVal bitmap As *GpBitmap, ByRef rect As GpRect, ByVal flags As DWord, ByVal format As Long /*PixelFormat*/, ByVal lockedBitmapData As *System.Drawing.Imaging.BitmapData) As GpStatus
+Declare Function GdipBitmapLockBits Lib "gdiplus.dll" (ByVal bitmap As *GpBitmap, ByRef rect As GpRect, ByVal flags As DWord, ByVal format As Long /*PixelFormat*/, ByRef lockedBitmapData As System.Drawing.Imaging.BitmapData) As GpStatus
 Declare Function GdipBitmapUnlockBits Lib "gdiplus.dll" (ByVal bitmap As *GpBitmap, ByRef lockedBitmapData As System.Drawing.Imaging.BitmapData) As GpStatus
 Declare Function GdipBitmapGetPixel Lib "gdiplus.dll" (ByVal bitmap As *GpBitmap, ByVal x As Long, ByVal y As Long, ByRef color As ARGB) As GpStatus