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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

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

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

@@ -75 +75 @@
 
     Static Function Add(pt1 As Point, pt2 As Point) As Point
-        Dim ret As Point(pt1.x + pt2.x, pt1.y + pt2.y)
-        Return ret
+        Return New Point(pt1.x + pt2.x, pt1.y + pt2.y)
     End Function
 
     Static Function Add(pt As Point, sz As Size) As Point
-        Dim ret As Point(pt.x + sz.Width, pt.y + sz.Height)
-        Return ret
+        Return New Point(pt.x + sz.Width, pt.y + sz.Height)
     End Function
 
     Function Offset(pt As Point) As Point
-        Dim ret As Point(x + pt.x, y + pt.y)
-        Return ret
+        Return New Point(x + pt.x, y + pt.y)
     End Function
 
@@ -95 +92 @@
 
     Static Function Substract(pt1 As Point, pt2 As Point) As Point
-        Dim ret As Point(pt1.x - pt2.x, pt1.y - pt2.y)
-        Return ret
+        Return New Point(pt1.x - pt2.x, pt1.y - pt2.y)
     End Function
 
     Static Function Substract(pt As Point, sz As Size) As Point
-        Dim ret As Point(pt.x - sz.Width, pt.y - sz.Height)
-        Return ret
+        Return New Point(pt.x - sz.Width, pt.y - sz.Height)
     End Function
 
@@ -113 +108 @@
 
     Static Function Ceiling(ptf As PointF) As Point
-        Dim pt As Size(Math.Ceiling(ptf.width), Math.Ceiling(ptf.height))
-        Return pt
+        Return New Point(System.Math.Ceiling(ptf.X) As Long, System.Math.Ceiling(ptf.Y) As Long)
     End Function
 
     Static Function Round(ptf As PointF) As Point
-        Dim pt As Point(Math.Round(ptf.width), Math.Round(ptf.height))
-        Return pt
+        Return New Point(System.Math.Round(ptf.X) As Long, System.Math.Round(ptf.Y) As Long)
     End Function
 
     Static Function Truncate(ptf As PointF) As Point
-        Dim pt As Point(Math.Truncate(ptf.width), Math.Truncate(ptf.height))
-        Return pt
+        Return New Point(System.Math.Truncate(ptf.X) As Long, System.Math.Truncate(ptf.Y) As Long)
     End Function
 
     Function Operator () As PointF
-        Return Return PointF(X, Y)
+        Return New PointF(X, Y)
     End Function