[Vala] [PATCH] PangoRectangle is not a reference type



---
 trunk/vala/vapi/pango.vala |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/trunk/vala/vapi/pango.vala b/trunk/vala/vapi/pango.vala
index 2e24d52..b9fea37 100644
--- a/trunk/vala/vapi/pango.vala
+++ b/trunk/vala/vapi/pango.vala
@@ -291,7 +291,7 @@ namespace Pango {
                public weak Pango.FontMap get_font_map ();
                [NoArrayLength ()]
                [CCode (cname = "pango_font_get_glyph_extents")]
-               public void get_glyph_extents (uint glyph, Pango.Rectangle ink_rect, Pango.Rectangle 
logical_rect);
+               public void get_glyph_extents (uint glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [CCode (cname = "pango_font_get_metrics")]
                public Pango.FontMetrics get_metrics (Pango.Language language);
@@ -381,13 +381,13 @@ namespace Pango {
                public weak Pango.Context get_context ();
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_cursor_pos")]
-               public void get_cursor_pos (int index_, Pango.Rectangle strong_pos, Pango.Rectangle weak_pos);
+               public void get_cursor_pos (int index_, out Pango.Rectangle strong_pos, out Pango.Rectangle 
weak_pos);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_ellipsize")]
                public Pango.EllipsizeMode get_ellipsize ();
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_extents")]
-               public void get_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_font_description")]
                public Pango.FontDescription get_font_description ();
@@ -420,7 +420,7 @@ namespace Pango {
                public void get_log_attrs (Pango.LogAttr attrs, int n_attrs);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_pixel_extents")]
-               public void get_pixel_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_get_pixel_size")]
                public void get_pixel_size (int width, int height);
@@ -456,7 +456,7 @@ namespace Pango {
                public void index_to_line_x (int index_, bool trailing, int line, int x_pos);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_index_to_pos")]
-               public void index_to_pos (int index_, Pango.Rectangle pos);
+               public void index_to_pos (int index_, out Pango.Rectangle pos);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_is_ellipsized")]
                public bool is_ellipsized ();
@@ -691,10 +691,10 @@ namespace Pango {
                public GLib.DestroyNotify destroy_func;
                [NoArrayLength ()]
                [CCode (cname = "pango_attr_shape_new")]
-               public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public AttrShape (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [CCode (cname = "pango_attr_shape_new_with_data")]
-               public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, pointer 
data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
+               public AttrShape.with_data (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect, 
pointer data, Pango.AttrDataCopyFunc copy_func, GLib.DestroyNotify destroy_func);
        }
        [ReferenceType ()]
        public struct AttrSize {
@@ -997,11 +997,11 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_glyph_string_extents")]
-               public void extents (Pango.Font font, Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_glyph_string_extents_range")]
-               public void extents_range (int start, int end, Pango.Font font, Pango.Rectangle ink_rect, 
Pango.Rectangle logical_rect);
+               public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, 
out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_glyph_string_free")]
@@ -1100,11 +1100,11 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_char_extents")]
-               public void get_char_extents (Pango.Rectangle logical_rect);
+               public void get_char_extents (out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_cluster_extents")]
-               public void get_cluster_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_cluster_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_index")]
@@ -1112,7 +1112,7 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_layout_extents")]
-               public void get_layout_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_layout_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_line")]
@@ -1120,7 +1120,7 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_line_extents")]
-               public void get_line_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_line_readonly")]
@@ -1136,7 +1136,7 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_run_extents")]
-               public void get_run_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_run_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_iter_get_run_readonly")]
@@ -1171,11 +1171,11 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_line_get_extents")]
-               public void get_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_layout_line_get_pixel_extents")]
-               public void get_pixel_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public void get_pixel_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle 
logical_rect);
                [NoArrayLength ()]
                [CCode (cname = "pango_layout_line_get_type")]
                public static GLib.Type get_type ();
@@ -1260,7 +1260,7 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_matrix_transform_pixel_rectangle")]
-               public void transform_pixel_rectangle (Pango.Rectangle rect);
+               public void transform_pixel_rectangle (ref Pango.Rectangle rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_matrix_transform_point")]
@@ -1268,13 +1268,12 @@ namespace Pango {
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_matrix_transform_rectangle")]
-               public void transform_rectangle (Pango.Rectangle rect);
+               public void transform_rectangle (ref Pango.Rectangle rect);
                [NoArrayLength ()]
                [InstanceByReference ()]
                [CCode (cname = "pango_matrix_translate")]
                public void translate (double tx, double ty);
        }
-       [ReferenceType ()]
        public struct Rectangle {
                public int x;
                public int y;
@@ -1437,7 +1436,7 @@ namespace Pango {
        public callback bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font, pointer data);
        [NoArrayLength ()]
        [CCode (cname = "pango_extents_to_pixels")]
-       public static void extents_to_pixels (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+       public static void extents_to_pixels (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
        [NoArrayLength ()]
        [CCode (cname = "pango_find_base_dir")]
        public static Pango.Direction find_base_dir (string text, int length);
-- 
1.4.4.2




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]