Changeset 303 for trunk/Include/Classes/System/Drawing/Color.ab

Timestamp:

Aug 24, 2007, 11:14:46 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

フルコンパイルでのミスあぶり出し。註：修正は全て@300や@301以前に行われた。

File:

• trunk/Include/Classes/System/Drawing/Color.ab (modified) (3 diffs)

trunk/Include/Classes/System/Drawing/Color.ab

@@ -69 +69 @@
             Exit Sub ' パレットインデックス指定は無効
         Else
-            argb = Color_MakeARGB(255, GetRValue(rgb), GetGValue(rgb), GetBValue(rgb))
+            argb = MakeARGB(255, GetRValue(rgb) As Byte, GetGValue(rgb) As Byte, GetBValue(rgb) As Byte)
         End If
     End Sub
@@ -82 +82 @@
 
     Static Function FromArgb(argb As ARGB) As Color
-        Dim c As Color(argb)
-        Rteurn c
+        Return New Color(argb)
     End Function
 
     Static Function FromArgb(a As Byte, base As Color) As Color
-        Dim c As Color(a, base.R, base.G, base.B)
-        Return c
+        Return New Color(a, base.R, base.G, base.B)
     End Function
 
     Static Function FromArgb(r As Byte, g As Byte, b As Byte) As Color
-        Dim c As Color(r, g, b)
-        Return c
+        Return New Color(r, g, b)
     End Function
 
     Static Function FromArgb(a As Byte, r As Byte, g As Byte, b As Byte) As Color
-        Dim c As Color(a, r, g, b)
-        Return c
+        Return New Color(a, r, g, b)
     End Function
 
@@ -119 +115 @@
         d = max - min
         If g = max Then
-            Return (b - r) As Double / d * 60 + 120
+            Return ((b - r) As Double / d * 60.0 + 120.0) As Single
         ElseIf b = max Then
-            Return (r - g) As Double / d * 60 + 240
+            Return ((r - g) As Double / d * 60 + 240) As Single
         ElseIf g < b Then
-            Return (g - b) As Double / d * 60 + 360
+            Return ((g - b) As Double / d * 60 + 360) As Single
         Else
-            Return (g - b) As Double / d * 60
+            Return ((g - b) As Double / d * 60) As Single
         EndIf
     End Function
 
     Function GetSaturation() As Single
-        Dim max As Long, min As Long
         Dim r = R
         Dim g = G
         Dim b = B
-        max = System.Math.Max(System.Math.Max(r, g), b)
-        min = System.Math.Min(System.Math.Min(r, g), b)
+        Dim max = System.Math.Max(System.Math.Max(r, g), b) As Long
+        Dim min = System.Math.Min(System.Math.Min(r, g), b) As Long
         Return (max - min) / max
     End Function
 
     Function GetBrightness() As Single
-        Dim max As Long
         Dim r = R
         Dim g = G
         Dim b = B
-        max = System.Math.Max(System.Math.Max(r, g), b)
+        Dim max = System.Math.Max(System.Math.Max(r, g), b)
         Return max * (1 / 255)
     End Function