Clarify misleading explanation of rowstride. (#119000)

2003-08-03  Matthias Clasen  <maclas@gmx.de>

	* gdk-pixbuf.c (gdk_pixbuf_get_rowstride):
	* gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Clarify misleading explanation of
	rowstride.  (#119000)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index c0c9799377d5f25779891b7aa1ce2ed04cc0c0b7..e7e960e1bd36677afd954e7199d15bf9809c7a81 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-03  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk-pixbuf/tmpl/gdk-pixbuf.sgml: Clarify misleading explanation of rowstride. (#119000)
+
 Tue Jul 29 14:21:48 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/tmpl/gtktoolbar.sgml: Move documentation inline

diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
index 10af46f255cc08fcb2433991b922746820d27eb4..728ae31d1b8729a601d79acae5619aaffbe1ecd0 100644 (file)
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
@@ -71,7 +71,8 @@ In the future it will do full alpha compositing.
     This is the main structure in the &gdk-pixbuf; library.  It is
     used to represent images.  It contains information about the
     image's pixel data, its color space, bits per sample, width and
-    height, and the rowstride or number of bytes between rows.
+    height, and the rowstride (the number of bytes between the start of
+    one row and the start of the next). 
   </para>
 
 

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 48fe53ffb494008d69501bec678fb0878447a5c1..4f3c7525face94deeb68e06b7dc4fb3d4e6bb9dc 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-03  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk-pixbuf.c (gdk_pixbuf_get_rowstride): 
+       * gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Clarify misleading explanation of 
+       rowstride.  (#119000)
+
 2003-07-24  Matthias Clasen  <maclas@gmx.de>
 
        * gdk-pixbuf-io.c (gdk_pixbuf_new_from_file_at_size): Preserve the aspect ratio.  (#118145, 

diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 5156c4ee86f95775b1d062a11df9ca8eca34f5c4..0686bdefc79c5f8c47c40d30d4838135dba6abbb 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -36,7 +36,7 @@
  * @bits_per_sample: Number of bits per sample.
  * @width: Width of the image in pixels.
  * @height: Height of the image in pixels.
- * @rowstride: Distance in bytes between rows.
+ * @rowstride: Distance in bytes between row starts.
  * @destroy_fn: Function used to free the data when the pixbuf's reference count
  * drops to zero, or %NULL if the data should not be freed.
  * @destroy_fn_data: Closure data to pass to the destroy notification function.
@@ -44,8 +44,7 @@
  * Creates a new #GdkPixbuf out of in-memory image data.  Currently only RGB
  * images with 8 bits per sample are supported.
  * 
- * Return value: A newly-created #GdkPixbuf structure with a reference count of
- * 1.
+ * Return value: A newly-created #GdkPixbuf structure with a reference count of 1.
  **/
 GdkPixbuf *
 gdk_pixbuf_new_from_data (const guchar *data, GdkColorspace colorspace, gboolean has_alpha,

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 2ae4bc645097bcf2807558206723bdd42231e16d..1a64de72dadb3dfb6efc18c24ca72e7147e52dbb 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -395,9 +395,10 @@ gdk_pixbuf_get_height (const GdkPixbuf *pixbuf)
  * gdk_pixbuf_get_rowstride:
  * @pixbuf: A pixbuf.
  *
- * Queries the rowstride of a pixbuf, which is the number of bytes between rows.
+ * Queries the rowstride of a pixbuf, which is the number of bytes between the start of a row
+ * and the start of the next row.
  *
- * Return value: Number of bytes between rows.
+ * Return value: Distance between row starts.
  **/
 int
 gdk_pixbuf_get_rowstride (const GdkPixbuf *pixbuf)