Change to return allocated array.

2000-09-27  Havoc Pennington  <hp@redhat.com>

	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
	allocated array.

9 files changed, 52 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index dfe7076f..141082c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index dfe7076f..141082c2 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2000-09-27  Havoc Pennington  <hp@redhat.com>
+
+	* pango/pango-tabs.c (pango_tab_array_get_tabs): Change to return
+	allocated array.
+
 2000-09-25  Havoc Pennington  <hp@redhat.com>
 
 	* pango/pango-layout.c: Add a tab array field to PangoLayout,
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index c5bcb94e..9931369b 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -299,33 +299,36 @@ pango_tab_array_get_tab  (PangoTabArray *tab_array,
 /**
  * pango_tab_array_get_tabs:
  * @tab_array: a #PangoTabArray
- * @alignments: array to fill with tab stop alignments
- * @locations: array to fill with tab stop positions
+ * @alignments: location to store an array of tab stop alignments
+ * @locations: location to store an array of tab positions
  *
- * @alignments and @locations must be arrays with
- * one member for each tab stop in @tab_array (i.e. the
- * size of @alignments and @locations should match
- * the result of pango_tab_array_get_size()). The arrays
- * will be filled with the alignment and location of
- * each tab stop.
+ * If non-NULL, @alignments and @locations are filled with allocated
+ * arrays of length pango_tab_array_get_size(). You must free the
+ * returned array.
  * 
  **/
 void
 pango_tab_array_get_tabs (PangoTabArray *tab_array,
-                          PangoTabAlign *alignments,
-                          gint          *locations)
+                          PangoTabAlign **alignments,
+                          gint          **locations)
 {
   gint i;
   
   g_return_if_fail (tab_array != NULL);
 
+  if (alignments)
+    *alignments = g_new (PangoTabAlign, tab_array->size);
+
+  if (locations)
+    *locations = g_new (gint, tab_array->size);
+  
   i = 0;
   while (i < tab_array->size)
     {
       if (alignments)
-        alignments[i] = tab_array->tabs[i].alignment;
+        (*alignments)[i] = tab_array->tabs[i].alignment;
       if (locations)
-        locations[i] = tab_array->tabs[i].location;
+        (*locations)[i] = tab_array->tabs[i].location;
 
       ++i;
     }
diff --git a/pango/pango-tabs.h b/pango/pango-tabs.h
index bba41488..9f1b5887 100644
--- a/pango/pango-tabs.h
+++ b/pango/pango-tabs.h
@@ -64,8 +64,8 @@ void            pango_tab_array_get_tab             (PangoTabArray *tab_array,
                                                      PangoTabAlign *alignment,
                                                      gint          *location);
 void            pango_tab_array_get_tabs            (PangoTabArray *tab_array,
-                                                     PangoTabAlign *alignments,
-                                                     gint          *locations);
+                                                     PangoTabAlign **alignments,
+                                                     gint          **locations);
 
 gboolean        pango_tab_array_get_positions_in_pixels (PangoTabArray *tab_array);