gimp r27332 - in trunk: . plug-ins/metadata

[neo svn gnome org]

Author: neo
Date: Sun Oct 19 16:44:40 2008
New Revision: 27332
URL: http://svn.gnome.org/viewvc/gimp?rev=27332&view=rev

Log:
2008-10-19  Sven Neumann  <sven gimp org>

	* plug-ins/metadata/xmp-encode.c
	* plug-ins/metadata/xmp-parse.c
	* plug-ins/metadata/metadata.c
	* plug-ins/metadata/xmpdump.c: removal of unused includes and
	other minor cleanups.



Modified:
   trunk/ChangeLog
   trunk/plug-ins/metadata/metadata.c
   trunk/plug-ins/metadata/xmp-encode.c
   trunk/plug-ins/metadata/xmp-parse.c
   trunk/plug-ins/metadata/xmpdump.c

Modified: trunk/plug-ins/metadata/metadata.c
==============================================================================
--- trunk/plug-ins/metadata/metadata.c	(original)
+++ trunk/plug-ins/metadata/metadata.c	Sun Oct 19 16:44:40 2008
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <stdio.h>
 
 #include <libgimp/gimp.h>
 

Modified: trunk/plug-ins/metadata/xmp-encode.c
==============================================================================
--- trunk/plug-ins/metadata/xmp-encode.c	(original)
+++ trunk/plug-ins/metadata/xmp-encode.c	Sun Oct 19 16:44:40 2008
@@ -20,10 +20,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtk.h>
+#include <glib-object.h>
 
 #include <libgimp/gimp.h>
 
@@ -116,7 +115,8 @@
     case XMP_TYPE_TEXT:
     case XMP_TYPE_RATIONAL:
       gen_element (buffer, 2,
-                   schema->prefix, property->name, value_array[0], NULL);
+                   schema->prefix, property->name, value_array[0],
+                   NULL);
       break;
 
     case XMP_TYPE_LOCALE_BAG:
@@ -128,7 +128,8 @@
       for (i = 0; value_array[i] != NULL; i++)
         {
           gen_element (buffer, 4,
-                       "rdf", "li", value_array[i], NULL);
+                       "rdf", "li", value_array[i],
+                       NULL);
         }
       g_string_append_printf (buffer, "   </rdf:Bag>\n  </%s:%s>\n",
                               schema->prefix, property->name);
@@ -143,7 +144,8 @@
       for (i = 0; value_array[i] != NULL; i++)
         {
           gen_element (buffer, 4,
-                       "rdf", "li", value_array[i], NULL);
+                       "rdf", "li", value_array[i],
+                       NULL);
         }
       g_string_append_printf (buffer, "   </rdf:Seq>\n  </%s:%s>\n",
                               schema->prefix, property->name);
@@ -200,7 +202,8 @@
         for (i = 2; value_array[i] != NULL; i += 2)
           {
             gen_element (buffer, 3,
-                         ns_prefix, value_array[i], value_array[i + 1], NULL);
+                         ns_prefix, value_array[i], value_array[i + 1],
+                         NULL);
           }
       g_string_append_printf (buffer, "  </%s:%s>\n",
                               schema->prefix, property->name);

Modified: trunk/plug-ins/metadata/xmp-parse.c
==============================================================================
--- trunk/plug-ins/metadata/xmp-parse.c	(original)
+++ trunk/plug-ins/metadata/xmp-parse.c	Sun Oct 19 16:44:40 2008
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /* xmp-parse.c - simple parser for XMP metadata
  *
  * Copyright (C) 2004-2007, RaphaÃl Quinet <raphael gimp org>
@@ -192,7 +191,7 @@
 };
 
 #ifdef DEBUG_XMP_PARSER
-static const char *state_names[] =
+static const gchar * const state_names[] =
 {
   "START",
   "INSIDE_XPACKET",

Modified: trunk/plug-ins/metadata/xmpdump.c
==============================================================================
--- trunk/plug-ins/metadata/xmpdump.c	(original)
+++ trunk/plug-ins/metadata/xmpdump.c	Sun Oct 19 16:44:40 2008
@@ -1,10 +1,12 @@
 /* simple program to test the XMP parser on files given on the command line */
 
-#include <stdio.h>
 #include <string.h>
-#include <glib/gprintf.h>
+
+#include <glib.h>
+
 #include "xmp-parse.h"
 
+
 static gpointer
 start_schema (XMPParseContext     *context,
               const gchar         *ns_uri,