diff --git a/ChangeLog b/ChangeLog index a2dfd5cf4..4e381fea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-28 Mike Kestner + + * pango/Context.custom : use ReadIntPtr (ptr, offset) for 64 bit. + * pango/FontFamily.custom : use ReadIntPtr (ptr, offset) for 64 bit. + * pango/FontMap.custom : use ReadIntPtr (ptr, offset) for 64 bit. + * pango/Layout.custom : use ReadIntPtr (ptr, offset) for 64 bit. + 2005-02-28 Mike Kestner * gdk/Region.custom : 64 bit fix for ptr arithmetic. [Fixes #77658] diff --git a/pango/Context.custom b/pango/Context.custom index 392cefb3d..8d7656aef 100644 --- a/pango/Context.custom +++ b/pango/Context.custom @@ -35,7 +35,7 @@ return new FontFamily [0]; FontFamily [] result = new FontFamily [count]; for (int i = 0; i < count; i++) { - IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + IntPtr fam_ptr = Marshal.ReadIntPtr (array_ptr, i * IntPtr.Size); result [i] = GLib.Object.GetObject (fam_ptr) as FontFamily; } diff --git a/pango/FontFamily.custom b/pango/FontFamily.custom index 2095467e7..b34f3bfa1 100644 --- a/pango/FontFamily.custom +++ b/pango/FontFamily.custom @@ -35,7 +35,7 @@ return new FontFace [0]; FontFace [] result = new FontFace [count]; for (int i = 0; i < count; i++) { - IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + IntPtr fam_ptr = Marshal.ReadIntPtr (array_ptr, i * IntPtr.Size); result [i] = GLib.Object.GetObject (fam_ptr) as FontFace; } diff --git a/pango/FontMap.custom b/pango/FontMap.custom index c6575b68b..62e3230b4 100644 --- a/pango/FontMap.custom +++ b/pango/FontMap.custom @@ -35,7 +35,7 @@ return new FontFamily [0]; FontFamily [] result = new FontFamily [count]; for (int i = 0; i < count; i++) { - IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + IntPtr fam_ptr = Marshal.ReadIntPtr (array_ptr, i * IntPtr.Size); result [i] = GLib.Object.GetObject (fam_ptr) as FontFamily; } diff --git a/pango/Layout.custom b/pango/Layout.custom index f2b785ae4..aa4db8806 100644 --- a/pango/Layout.custom +++ b/pango/Layout.custom @@ -64,7 +64,7 @@ public void SetMarkupWithAccel (string markup, char accel_marker, out char accel return new LogAttr [0]; LogAttr [] result = new LogAttr [count]; for (int i = 0; i < count; i++) { - IntPtr fam_ptr = Marshal.ReadIntPtr (new IntPtr ((int)array_ptr + i * IntPtr.Size)); + IntPtr fam_ptr = Marshal.ReadIntPtr (array_ptr, i * IntPtr.Size); result [i] = LogAttr.New (fam_ptr); }