[gimp/wip/gradient-edit: 15/43] app: implement copy() for GimpGradient



commit 6f46c4a8b92e55ecb1c1efa4d439d91083d31093
Author: Ell <ell_se yahoo com>
Date:   Wed Jul 26 13:46:18 2017 -0400

    app: implement copy() for GimpGradient
    
    ... instead of duplicate().

 app/core/gimpgradient.c |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
index 2c70515..173bd21 100644
--- a/app/core/gimpgradient.c
+++ b/app/core/gimpgradient.c
@@ -61,8 +61,10 @@ static GimpTempBuf * gimp_gradient_get_new_preview   (GimpViewable        *viewa
                                                       GimpContext         *context,
                                                       gint                 width,
                                                       gint                 height);
+
 static const gchar * gimp_gradient_get_extension     (GimpData            *data);
-static GimpData    * gimp_gradient_duplicate         (GimpData            *data);
+static void          gimp_gradient_copy              (GimpData            *data,
+                                                      GimpData            *src_data);
 
 static gchar       * gimp_gradient_get_checksum      (GimpTagged          *tagged);
 
@@ -110,7 +112,7 @@ gimp_gradient_class_init (GimpGradientClass *klass)
 
   data_class->save                  = gimp_gradient_save;
   data_class->get_extension         = gimp_gradient_get_extension;
-  data_class->duplicate             = gimp_gradient_duplicate;
+  data_class->copy                  = gimp_gradient_copy;
 }
 
 static void
@@ -232,16 +234,24 @@ gimp_gradient_get_new_preview (GimpViewable *viewable,
   return temp_buf;
 }
 
-static GimpData *
-gimp_gradient_duplicate (GimpData *data)
+static void
+gimp_gradient_copy (GimpData *data,
+                    GimpData *src_data)
 {
-  GimpGradient        *gradient;
+  GimpGradient        *gradient     = GIMP_GRADIENT (data);
+  GimpGradient        *src_gradient = GIMP_GRADIENT (src_data);
   GimpGradientSegment *head, *prev, *cur, *orig;
 
-  gradient = g_object_new (GIMP_TYPE_GRADIENT, NULL);
+  gimp_data_freeze (GIMP_DATA (gradient));
+
+  if (gradient->segments)
+    {
+      gimp_gradient_segments_free (gradient->segments);
+      gradient->segments = NULL;
+    }
 
   prev = NULL;
-  orig = GIMP_GRADIENT (data)->segments;
+  orig = GIMP_GRADIENT (src_gradient)->segments;
   head = NULL;
 
   while (orig)
@@ -264,7 +274,7 @@ gimp_gradient_duplicate (GimpData *data)
 
   gradient->segments = head;
 
-  return GIMP_DATA (gradient);
+  gimp_data_thaw (GIMP_DATA (gradient));
 }
 
 static gchar *


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