GNOME.org
 

[gimp] Revert "libgimp: API with new object classes are since 3.0."

commit 2fd35e77b5ef00be7f4dc3cac764764507ba218a
Author: Michael Natterer <mitch gimp org>
Date:   Fri Aug 30 18:44:56 2019 +0200

    Revert "libgimp: API with new object classes are since 3.0."
    
    This reverts commit e24375e64a78b6d83710ca6a3d539c3fbb8cd0fb.
    
    The API is semantically the same, and there is no danger of confusion,
    no need to update the Since: tags.

 libgimp/gimpchannel.c   |  2 --
 libgimp/gimpdisplay.c   |  2 +-
 libgimp/gimpdrawable.c  | 34 ++++++----------------------------
 libgimp/gimpimage.c     | 20 ++++----------------
 libgimp/gimpitem.c      | 18 ++++++++----------
 libgimp/gimplayer.c     | 16 ++++++++--------
 libgimp/gimpselection.c |  2 --
 7 files changed, 27 insertions(+), 67 deletions(-)
---
diff --git a/libgimp/gimpchannel.c b/libgimp/gimpchannel.c
index c44da9bfe1..6bb657b5eb 100644
--- a/libgimp/gimpchannel.c
+++ b/libgimp/gimpchannel.c
@@ -66,8 +66,6 @@ gimp_channel_init (GimpChannel *channel)
  *
  * Returns: (transfer none): The newly created channel.
  *          The object belongs to libgimp and you should not free it.
- *
- * Since: 3.0
  */
 GimpChannel *
 gimp_channel_new (GimpImage     *image,
diff --git a/libgimp/gimpdisplay.c b/libgimp/gimpdisplay.c
index a44c4c9858..b66067c783 100644
--- a/libgimp/gimpdisplay.c
+++ b/libgimp/gimpdisplay.c
@@ -188,7 +188,7 @@ gimp_display_get_by_id (gint32 display_id)
  *
  * Returns: Whether the display is valid.
  *
- * Since: 3.0
+ * Since: 2.4
  **/
 gboolean
 gimp_display_is_valid (GimpDisplay *display)
diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c
index 51e936216a..c5146c14fa 100644
--- a/libgimp/gimpdrawable.c
+++ b/libgimp/gimpdrawable.c
@@ -64,8 +64,6 @@ gimp_drawable_init (GimpDrawable *drawable)
  *
  * Returns: (transfer full) (nullable): thumbnail data or %NULL if
  *          @drawable is invalid.
- *
- * Since: 3.0
  **/
 guchar *
 gimp_drawable_get_thumbnail_data (GimpDrawable *drawable,
@@ -106,7 +104,7 @@ gimp_drawable_get_thumbnail_data (GimpDrawable *drawable,
  *
  * Returns: (transfer full): a new #GdkPixbuf
  *
- * Since: 3.0
+ * Since: 2.2
  **/
 GdkPixbuf *
 gimp_drawable_get_thumbnail (GimpDrawable           *drawable,
@@ -135,25 +133,6 @@ gimp_drawable_get_thumbnail (GimpDrawable           *drawable,
   return NULL;
 }
 
-/**
- * gimp_drawable_get_sub_thumbnail_data:
- * @drawable:             the drawable ID
- * @src_x:                the x coordinate of the area
- * @src_y:                the y coordinate of the area
- * @src_width:            the width of the area
- * @src_height:           the height of the area
- * @dest_width: (inout):  the requested thumbnail width  (<= 1024 pixels)
- * @dest_height: (inout): the requested thumbnail height (<= 1024 pixels)
- * @bpp: (out):           the bytes per pixel of the returned thumbnail data
- *
- * Retrieves thumbnail data for the drawable identified by @drawable.
- * The thumbnail will be not larger than the requested size.
- *
- * Returns: (transfer full) (nullable): thumbnail data or %NULL if
- *          @drawable is invalid.
- *
- * Since: 3.0
- **/
 guchar *
 gimp_drawable_get_sub_thumbnail_data (GimpDrawable *drawable,
                                       gint          src_x,
@@ -203,7 +182,7 @@ gimp_drawable_get_sub_thumbnail_data (GimpDrawable *drawable,
  *
  * Returns: (transfer full): a new #GdkPixbuf
  *
- * Since: 3.0
+ * Since: 2.2
  **/
 GdkPixbuf *
 gimp_drawable_get_sub_thumbnail (GimpDrawable           *drawable,
@@ -255,7 +234,7 @@ gimp_drawable_get_sub_thumbnail (GimpDrawable           *drawable,
  *
  * See Also: gimp_drawable_get_shadow_buffer()
  *
- * Since: 3.0
+ * Since: 2.10
  */
 GeglBuffer *
 gimp_drawable_get_buffer (GimpDrawable *drawable)
@@ -288,7 +267,7 @@ gimp_drawable_get_buffer (GimpDrawable *drawable)
  *
  * See Also: gimp_drawable_get_shadow_buffer()
  *
- * Since: 3.0
+ * Since: 2.10
  */
 GeglBuffer *
 gimp_drawable_get_shadow_buffer (GimpDrawable *drawable)
@@ -316,7 +295,7 @@ gimp_drawable_get_shadow_buffer (GimpDrawable *drawable)
  *
  * Returns: The #Babl format.
  *
- * Since: 3.0
+ * Since: 2.10
  */
 const Babl *
 gimp_drawable_get_format (GimpDrawable *drawable)
@@ -394,7 +373,6 @@ gimp_drawable_get_format (GimpDrawable *drawable)
 
   return format;
 }
-
 /**
  * gimp_drawable_get_thumbnail_format:
  * @drawable: the ID of the #GimpDrawable to get the thumbnail format for.
@@ -403,7 +381,7 @@ gimp_drawable_get_format (GimpDrawable *drawable)
  *
  * Returns: The #Babl thumbnail format.
  *
- * Since: 3.0
+ * Since: 2.10.14
  */
 const Babl *
 gimp_drawable_get_thumbnail_format (GimpDrawable *drawable)
diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c
index 2ae9b2ba43..5d26e57f0d 100644
--- a/libgimp/gimpimage.c
+++ b/libgimp/gimpimage.c
@@ -186,7 +186,7 @@ gimp_image_get_by_id (gint32 image_id)
  *
  * Returns: Whether the image is valid.
  *
- * Since: 3.0
+ * Since: 2.4
  **/
 gboolean
 gimp_image_is_valid (GimpImage *image)
@@ -275,8 +275,6 @@ gimp_list_images (void)
  *          The list of layers contained in the image.
  *          The returned array must be freed with g_free(). Layer
  *          elements belong to libgimp and must not be freed.
- *
- * Since: 3.0
  **/
 GimpLayer **
 gimp_image_get_layers (GimpImage *image,
@@ -315,8 +313,6 @@ gimp_image_get_layers (GimpImage *image,
  *          The list of channels contained in the image.
  *          The returned array must be freed with g_free(). Channel
  *          elements belong to libgimp and must not be freed.
- *
- * Since: 3.0
  **/
 GimpChannel **
 gimp_image_get_channels (GimpImage *image,
@@ -352,8 +348,6 @@ gimp_image_get_channels (GimpImage *image,
  *          The list of vectors contained in the image.
  *          The returned array must be freed with g_free(). Vectors
  *          elements belong to libgimp and must not be freed.
- *
- * Since: 3.0
  **/
 GimpVectors **
 gimp_image_get_vectors (GimpImage *image,
@@ -495,8 +489,6 @@ gimp_image_list_vectors (GimpImage *image)
  * is not of base type INDEXED, this pointer will be NULL.
  *
  * Returns: The image's colormap.
- *
- * Since: 3.0
  */
 guchar *
 gimp_image_get_colormap (GimpImage *image,
@@ -527,8 +519,6 @@ gimp_image_get_colormap (GimpImage *image,
  * in the "cmap" array.
  *
  * Returns: TRUE on success.
- *
- * Since: 3.0
  */
 gboolean
 gimp_image_set_colormap (GimpImage    *image,
@@ -553,8 +543,6 @@ gimp_image_set_colormap (GimpImage    *image,
  * gives the number of bytes per pixel in the image.
  *
  * Returns: (transfer full): the thumbnail data.
- *
- * Since: 3.0
  **/
 guchar *
 gimp_image_get_thumbnail_data (GimpImage *image,
@@ -594,7 +582,7 @@ gimp_image_get_thumbnail_data (GimpImage *image,
  *
  * Returns: (transfer full): a new #GdkPixbuf
  *
- * Since: 3.0
+ * Since: 2.2
  **/
 GdkPixbuf *
 gimp_image_get_thumbnail (GimpImage              *image,
@@ -633,7 +621,7 @@ gimp_image_get_thumbnail (GimpImage              *image,
  * Returns: (nullable) (transfer full): The exif/ptc/xmp metadata,
  *          or %NULL if there is none.
  *
- * Since: 3.0
+ * Since: 2.10
  **/
 GimpMetadata *
 gimp_image_get_metadata (GimpImage *image)
@@ -663,7 +651,7 @@ gimp_image_get_metadata (GimpImage *image)
  *
  * Returns: TRUE on success.
  *
- * Since: 3.0
+ * Since: 2.10
  **/
 gboolean
 gimp_image_set_metadata (GimpImage    *image,
diff --git a/libgimp/gimpitem.c b/libgimp/gimpitem.c
index ac507f8dbd..acdc8cb2ca 100644
--- a/libgimp/gimpitem.c
+++ b/libgimp/gimpitem.c
@@ -218,7 +218,7 @@ gimp_item_get_by_id (gint32 item_id)
  *
  * Returns: Whether the item is valid.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_valid (GimpItem *item)
@@ -236,7 +236,7 @@ gimp_item_is_valid (GimpItem *item)
  *
  * Returns: TRUE if the item is a drawable, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_drawable (GimpItem *item)
@@ -254,7 +254,7 @@ gimp_item_is_drawable (GimpItem *item)
  *
  * Returns: TRUE if the item is a layer, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_layer (GimpItem *item)
@@ -273,7 +273,7 @@ gimp_item_is_layer (GimpItem *item)
  *
  * Returns: TRUE if the item is a text layer, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_text_layer (GimpItem *item)
@@ -291,7 +291,7 @@ gimp_item_is_text_layer (GimpItem *item)
  *
  * Returns: TRUE if the item is a channel, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_channel (GimpItem *item)
@@ -310,7 +310,7 @@ gimp_item_is_channel (GimpItem *item)
  *
  * Returns: TRUE if the item is a layer mask, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_layer_mask (GimpItem *item)
@@ -328,7 +328,7 @@ gimp_item_is_layer_mask (GimpItem *item)
  *
  * Returns: TRUE if the item is a selection, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_selection (GimpItem *item)
@@ -346,7 +346,7 @@ gimp_item_is_selection (GimpItem *item)
  *
  * Returns: TRUE if the item is a vectors, FALSE otherwise.
  *
- * Since: 3.0
+ * Since: 2.8
  **/
 gboolean
 gimp_item_is_vectors (GimpItem *item)
@@ -368,8 +368,6 @@ gimp_item_is_vectors (GimpItem *item)
  *          The item's list of children.
  *          The returned array must be freed with g_free(). Item
  *          elements belong to libgimp and must not be unrefed.
- *
- * Since: 3.0
  **/
 GimpItem **
 gimp_item_get_children (GimpItem *item,
diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c
index 6fcc394e0b..677df53587 100644
--- a/libgimp/gimplayer.c
+++ b/libgimp/gimplayer.c
@@ -136,7 +136,7 @@ gimp_layer_copy (GimpLayer *layer)
  * Returns: (transfer none): The newly created layer.
  *          The object belongs to libgimp and you should not free it.
  *
- * Since: 3.0
+ * Since: 2.2
  */
 GimpLayer *
 gimp_layer_new_from_pixbuf (GimpImage     *image,
@@ -215,14 +215,14 @@ gimp_layer_new_from_pixbuf (GimpImage     *image,
  * Returns: (transfer none): The newly created layer.
  *          The object belongs to libgimp and you should not free it.
  *
- * Since: 3.0
+ * Since: 2.8
  */
 GimpLayer *
-gimp_layer_new_from_surface (GimpImage       *image,
-                             const gchar     *name,
-                             cairo_surface_t *surface,
-                             gdouble          progress_start,
-                             gdouble          progress_end)
+gimp_layer_new_from_surface (GimpImage            *image,
+                             const gchar          *name,
+                             cairo_surface_t      *surface,
+                             gdouble               progress_start,
+                             gdouble               progress_end)
 {
   GeglBuffer    *src_buffer;
   GeglBuffer    *dest_buffer;
@@ -278,7 +278,7 @@ gimp_layer_new_from_surface (GimpImage       *image,
 }
 
 
-/* Deprecated API. */
+/* Deprecate API. */
 
 
 /**
diff --git a/libgimp/gimpselection.c b/libgimp/gimpselection.c
index 697730b8dd..e4a8aa7176 100644
--- a/libgimp/gimpselection.c
+++ b/libgimp/gimpselection.c
@@ -62,8 +62,6 @@ gimp_selection_init (GimpSelection *selection)
  * positioning of the new floating selection.
  *
  * Returns: (transfer none): The floated layer.
- *
- * Since: 3.0
  */
 GimpLayer *
 gimp_selection_float (GimpImage    *image,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]