gimp r27245 - in branches/soc-2008-tagging: . app/core

[aurisj svn gnome org]

Author: aurisj
Date: Sun Oct 12 17:21:37 2008
New Revision: 27245
URL: http://svn.gnome.org/viewvc/gimp?rev=27245&view=rev

Log:
2008-10-12  Aurimas JuÅka  <aurisj svn gnome org>

	* app/core/gimpbrush.c
	* app/core/gimpgradient.c
	* app/core/gimppalette.c
	* app/core/gimppattern.c: implementations of GimpTagged methods moved
	right after the implementations of other vtable methods. GimpTagged
	interface init functions moved right after class_init() functions.
	Improved function header formatting.



Modified:
   branches/soc-2008-tagging/ChangeLog
   branches/soc-2008-tagging/app/core/gimpbrush.c
   branches/soc-2008-tagging/app/core/gimpgradient.c
   branches/soc-2008-tagging/app/core/gimppalette.c
   branches/soc-2008-tagging/app/core/gimppattern.c

Modified: branches/soc-2008-tagging/app/core/gimpbrush.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimpbrush.c	(original)
+++ branches/soc-2008-tagging/app/core/gimpbrush.c	Sun Oct 12 17:21:37 2008
@@ -49,7 +49,7 @@
   PROP_SPACING
 };
 
-static void        gimp_brush_tagged_init           (GimpTaggedInterface    *iface);
+static void          gimp_brush_tagged_init           (GimpTaggedInterface    *iface);
 
 static void          gimp_brush_set_property          (GObject       *object,
                                                        guint          property_id,
@@ -82,7 +82,7 @@
                                                        GimpCoords    *last_coords,
                                                        GimpCoords    *cur_coords);
 
-static gchar     * gimp_brush_get_checksum          (GimpTagged    *tagged);
+static gchar       * gimp_brush_get_checksum          (GimpTagged    *tagged);
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpBrush, gimp_brush, GIMP_TYPE_DATA,
@@ -139,6 +139,12 @@
 }
 
 static void
+gimp_brush_tagged_init (GimpTaggedInterface    *iface)
+{
+  iface->get_checksum = gimp_brush_get_checksum;
+}
+
+static void
 gimp_brush_init (GimpBrush *brush)
 {
   brush->mask     = NULL;
@@ -152,12 +158,6 @@
 }
 
 static void
-gimp_brush_tagged_init (GimpTaggedInterface    *iface)
-{
-  iface->get_checksum = gimp_brush_get_checksum;
-}
-
-static void
 gimp_brush_set_property (GObject      *object,
                          guint         property_id,
                          const GValue *value,
@@ -370,6 +370,37 @@
   return TRUE;
 }
 
+static gchar *
+gimp_brush_get_checksum (GimpTagged *tagged)
+{
+  GimpBrush            *brush = GIMP_BRUSH (tagged);
+  TempBuf              *buffer;
+  GChecksum            *checksum;
+  gchar                *checksum_string;
+
+  if (! brush->mask)
+    {
+      return NULL;
+    }
+
+  checksum = g_checksum_new (G_CHECKSUM_MD5);
+
+  buffer = brush->pixmap;
+  if (buffer)
+    {
+      g_checksum_update (checksum, temp_buf_data (buffer),
+                         buffer->width * buffer->height * buffer->bytes);
+    }
+  buffer = brush->mask;
+  g_checksum_update (checksum, temp_buf_data (buffer),
+                     buffer->width * buffer->height * buffer->bytes);
+
+  checksum_string = g_strdup (g_checksum_get_string (checksum));
+
+  g_checksum_free (checksum);
+
+  return checksum_string;
+}
 
 /*  public functions  */
 
@@ -529,35 +560,3 @@
   g_signal_emit (brush, brush_signals[SPACING_CHANGED], 0);
 }
 
-static gchar *
-gimp_brush_get_checksum (GimpTagged      *tagged)
-{
-  GimpBrush            *brush = GIMP_BRUSH (tagged);
-  TempBuf              *buffer;
-  GChecksum            *checksum;
-  gchar                *checksum_string;
-
-  if (! brush->mask)
-    {
-      return NULL;
-    }
-
-  checksum = g_checksum_new (G_CHECKSUM_MD5);
-
-  buffer = brush->pixmap;
-  if (buffer)
-    {
-      g_checksum_update (checksum, temp_buf_data (buffer),
-                         buffer->width * buffer->height * buffer->bytes);
-    }
-  buffer = brush->mask;
-  g_checksum_update (checksum, temp_buf_data (buffer),
-                     buffer->width * buffer->height * buffer->bytes);
-
-  checksum_string = g_strdup (g_checksum_get_string (checksum));
-
-  g_checksum_free (checksum);
-
-  return checksum_string;
-}
-

Modified: branches/soc-2008-tagging/app/core/gimpgradient.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimpgradient.c	(original)
+++ branches/soc-2008-tagging/app/core/gimpgradient.c	Sun Oct 12 17:21:37 2008
@@ -114,15 +114,15 @@
 }
 
 static void
-gimp_gradient_init (GimpGradient *gradient)
+gimp_gradient_tagged_init (GimpTaggedInterface         *iface)
 {
-  gradient->segments = NULL;
+  iface->get_checksum   = gimp_gradient_get_checksum;
 }
 
 static void
-gimp_gradient_tagged_init (GimpTaggedInterface         *iface)
+gimp_gradient_init (GimpGradient *gradient)
 {
-  iface->get_checksum   = gimp_gradient_get_checksum;
+  gradient->segments = NULL;
 }
 
 static void
@@ -267,6 +267,52 @@
   return GIMP_DATA (gradient);
 }
 
+static gchar *
+gimp_gradient_get_checksum (GimpTagged *tagged)
+{
+  GimpGradient         *gradient = GIMP_GRADIENT (tagged);
+  GChecksum            *checksum;
+  gchar                *checksum_string;
+  GimpGradientSegment  *segment;
+
+  if (! gradient->segments)
+    {
+      return NULL;
+    }
+
+  checksum = g_checksum_new (G_CHECKSUM_MD5);
+  segment = gradient->segments;
+  while (segment)
+    {
+      g_checksum_update (checksum, (const guchar *) &segment->left,
+                         sizeof (segment->left));
+      g_checksum_update (checksum, (const guchar *) &segment->middle,
+                         sizeof (segment->middle));
+      g_checksum_update (checksum, (const guchar *) &segment->right,
+                         sizeof (segment->right));
+
+      g_checksum_update (checksum, (const guchar *) &segment->left_color_type,
+                         sizeof (segment->left_color_type));
+      g_checksum_update (checksum, (const guchar *) &segment->left_color,
+                         sizeof (segment->left_color));
+      g_checksum_update (checksum, (const guchar *) &segment->right_color_type,
+                         sizeof (segment->right_color_type));
+      g_checksum_update (checksum, (const guchar *) &segment->right_color,
+                         sizeof (segment->right_color));
+
+      g_checksum_update (checksum, (const guchar *) &segment->type,
+                         sizeof (segment->type));
+      g_checksum_update (checksum, (const guchar *) &segment->color,
+                         sizeof (segment->color));
+
+      segment = segment->next;
+    }
+
+  checksum_string = g_strdup (g_checksum_get_string (checksum));
+  g_checksum_free (checksum);
+
+  return checksum_string;
+}
 
 /*  public functions  */
 
@@ -2010,50 +2056,3 @@
   return 1.0 - sqrt(1.0 - pos * pos);
 }
 
-static gchar *
-gimp_gradient_get_checksum (GimpTagged         *tagged)
-{
-  GimpGradient         *gradient = GIMP_GRADIENT (tagged);
-  GChecksum            *checksum;
-  gchar                *checksum_string;
-  GimpGradientSegment  *segment;
-
-  if (! gradient->segments)
-    {
-      return NULL;
-    }
-
-  checksum = g_checksum_new (G_CHECKSUM_MD5);
-  segment = gradient->segments;
-  while (segment)
-    {
-      g_checksum_update (checksum, (const guchar *) &segment->left,
-                         sizeof (segment->left));
-      g_checksum_update (checksum, (const guchar *) &segment->middle,
-                         sizeof (segment->middle));
-      g_checksum_update (checksum, (const guchar *) &segment->right,
-                         sizeof (segment->right));
-
-      g_checksum_update (checksum, (const guchar *) &segment->left_color_type,
-                         sizeof (segment->left_color_type));
-      g_checksum_update (checksum, (const guchar *) &segment->left_color,
-                         sizeof (segment->left_color));
-      g_checksum_update (checksum, (const guchar *) &segment->right_color_type,
-                         sizeof (segment->right_color_type));
-      g_checksum_update (checksum, (const guchar *) &segment->right_color,
-                         sizeof (segment->right_color));
-
-      g_checksum_update (checksum, (const guchar *) &segment->type,
-                         sizeof (segment->type));
-      g_checksum_update (checksum, (const guchar *) &segment->color,
-                         sizeof (segment->color));
-
-      segment = segment->next;
-    }
-
-  checksum_string = g_strdup (g_checksum_get_string (checksum));
-  g_checksum_free (checksum);
-
-  return checksum_string;
-}
-

Modified: branches/soc-2008-tagging/app/core/gimppalette.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimppalette.c	(original)
+++ branches/soc-2008-tagging/app/core/gimppalette.c	Sun Oct 12 17:21:37 2008
@@ -105,17 +105,17 @@
 }
 
 static void
-gimp_palette_init (GimpPalette *palette)
+gimp_palette_tagged_init (GimpTaggedInterface  *iface)
 {
-  palette->colors    = NULL;
-  palette->n_colors  = 0;
-  palette->n_columns = 0;
+  iface->get_checksum   = gimp_palette_get_checksum;
 }
 
 static void
-gimp_palette_tagged_init (GimpTaggedInterface  *iface)
+gimp_palette_init (GimpPalette *palette)
 {
-  iface->get_checksum   = gimp_palette_get_checksum;
+  palette->colors    = NULL;
+  palette->n_colors  = 0;
+  palette->n_columns = 0;
 }
 
 static void
@@ -328,6 +328,37 @@
   return GIMP_DATA (new);
 }
 
+static gchar *
+gimp_palette_get_checksum (GimpTagged *tagged)
+{
+  GimpPalette          *palette = GIMP_PALETTE (tagged);
+  GChecksum            *checksum;
+  gchar                *checksum_string;
+  GimpPaletteEntry     *entry;
+  GList                *color_iterator;
+
+  if (palette->n_colors < 1)
+    {
+      return NULL;
+    }
+
+  checksum = g_checksum_new (G_CHECKSUM_MD5);
+  g_checksum_update (checksum, (const guchar *) &palette->n_colors,
+                     sizeof (palette->n_colors));
+  color_iterator = palette->colors;
+  while (color_iterator)
+    {
+      entry = (GimpPaletteEntry *) color_iterator->data;
+      g_checksum_update (checksum, (const guchar *) &entry->color,
+                         sizeof (entry->color));
+      color_iterator = g_list_next (color_iterator);
+    }
+  checksum_string = g_strdup (g_checksum_get_string (checksum));
+  g_checksum_free (checksum);
+
+  return checksum_string;
+}
+
 GimpPaletteEntry *
 gimp_palette_add_entry (GimpPalette   *palette,
                         gint           position,
@@ -519,33 +550,3 @@
   return memsize;
 }
 
-static gchar *
-gimp_palette_get_checksum (GimpTagged          *tagged)
-{
-  GimpPalette          *palette = GIMP_PALETTE (tagged);
-  GChecksum            *checksum;
-  gchar                *checksum_string;
-  GimpPaletteEntry     *entry;
-  GList                *color_iterator;
-
-  if (palette->n_colors < 1)
-    {
-      return NULL;
-    }
-
-  checksum = g_checksum_new (G_CHECKSUM_MD5);
-  g_checksum_update (checksum, (const guchar *) &palette->n_colors,
-                     sizeof (palette->n_colors));
-  color_iterator = palette->colors;
-  while (color_iterator)
-    {
-      entry = (GimpPaletteEntry *) color_iterator->data;
-      g_checksum_update (checksum, (const guchar *) &entry->color,
-                         sizeof (entry->color));
-      color_iterator = g_list_next (color_iterator);
-    }
-  checksum_string = g_strdup (g_checksum_get_string (checksum));
-  g_checksum_free (checksum);
-
-  return checksum_string;
-}

Modified: branches/soc-2008-tagging/app/core/gimppattern.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimppattern.c	(original)
+++ branches/soc-2008-tagging/app/core/gimppattern.c	Sun Oct 12 17:21:37 2008
@@ -85,15 +85,15 @@
 }
 
 static void
-gimp_pattern_init (GimpPattern *pattern)
+gimp_pattern_tagged_init (GimpTaggedInterface  *iface)
 {
-  pattern->mask = NULL;
+  iface->get_checksum   = gimp_pattern_get_checksum;
 }
 
 static void
-gimp_pattern_tagged_init (GimpTaggedInterface  *iface)
+gimp_pattern_init (GimpPattern *pattern)
 {
-  iface->get_checksum   = gimp_pattern_get_checksum;
+  pattern->mask = NULL;
 }
 
 static void
@@ -188,6 +188,30 @@
   return GIMP_DATA (pattern);
 }
 
+static gchar *
+gimp_pattern_get_checksum (GimpTagged *tagged)
+{
+  GimpPattern          *pattern = GIMP_PATTERN (tagged);
+  TempBuf              *buffer;
+  GChecksum            *checksum;
+  gchar                *checksum_string;
+
+  if (! pattern->mask)
+    {
+      return NULL;
+    }
+
+  checksum = g_checksum_new (G_CHECKSUM_MD5);
+
+  buffer = pattern->mask;
+  g_checksum_update (checksum, temp_buf_data (buffer),
+                     buffer->width * buffer->height * buffer->bytes);
+  checksum_string = g_strdup (g_checksum_get_string (checksum));
+  g_checksum_free (checksum);
+
+  return checksum_string;
+}
+
 GimpData *
 gimp_pattern_new (const gchar *name)
 {
@@ -243,26 +267,3 @@
   return pattern->mask;
 }
 
-static gchar *
-gimp_pattern_get_checksum (GimpTagged          *tagged)
-{
-  GimpPattern          *pattern = GIMP_PATTERN (tagged);
-  TempBuf              *buffer;
-  GChecksum            *checksum;
-  gchar                *checksum_string;
-
-  if (! pattern->mask)
-    {
-      return NULL;
-    }
-
-  checksum = g_checksum_new (G_CHECKSUM_MD5);
-
-  buffer = pattern->mask;
-  g_checksum_update (checksum, temp_buf_data (buffer),
-                     buffer->width * buffer->height * buffer->bytes);
-  checksum_string = g_strdup (g_checksum_get_string (checksum));
-  g_checksum_free (checksum);
-
-  return checksum_string;
-}