pango r2769 - in trunk: . pango-view

[behdad svn gnome org]

Author: behdad
Date: Fri Dec 26 03:22:31 2008
New Revision: 2769
URL: http://svn.gnome.org/viewvc/pango?rev=2769&view=rev

Log:
2008-12-25  Behdad Esfahbod  <behdad gnome org>

        * pango-view/viewer-main.c (main):
        * pango-view/viewer-pangocairo.c (pangocairo_view_create),
        (transform_callback), (pangocairo_view_render),
        (pangocairo_view_write):
        * pango-view/viewer-pangoft2.c (substitute_func),
        (pangoft2_view_create), (pangoft2_view_create_surface),
        (pangoft2_view_destroy_surface), (render_callback),
        (pangoft2_view_render), (pangoft2_view_write):
        * pango-view/viewer-pangox.c (render_callback):
        * pango-view/viewer-pangoxft.c (default_substitute),
        (render_callback):
        * pango-view/viewer-render.c (parse_enum), (parse_align),
        (parse_ellipsis), (parse_gravity), (parse_gravity_hint),
        (parse_hinting), (parse_wrap), (parse_backend), (show_version):
        * pango-view/viewer-x.c (x_view_init):
        Fix all warnings in pango-view/

Modified:
   trunk/ChangeLog
   trunk/pango-view/viewer-main.c
   trunk/pango-view/viewer-pangocairo.c
   trunk/pango-view/viewer-pangoft2.c
   trunk/pango-view/viewer-pangox.c
   trunk/pango-view/viewer-pangoxft.c
   trunk/pango-view/viewer-render.c
   trunk/pango-view/viewer-x.c

Modified: trunk/pango-view/viewer-main.c
==============================================================================
--- trunk/pango-view/viewer-main.c	(original)
+++ trunk/pango-view/viewer-main.c	Fri Dec 26 03:22:31 2008
@@ -86,7 +86,7 @@
 
 	      convert_argv[2] = opt_output;
 
-	      if (!g_spawn_async_with_pipes (NULL, (gchar **)convert_argv, NULL,
+	      if (!g_spawn_async_with_pipes (NULL, (gchar **)(void*)convert_argv, NULL,
 					     G_SPAWN_DO_NOT_REAP_CHILD |
 					     G_SPAWN_SEARCH_PATH |
 					     G_SPAWN_STDOUT_TO_DEV_NULL |
@@ -141,7 +141,7 @@
 	    fail ("%s viewer backend does not support displaying or writing", view->name);
 	  display_argv[2] = title;
 
-	  if (!g_spawn_async_with_pipes (NULL, (gchar **)display_argv, NULL,
+	  if (!g_spawn_async_with_pipes (NULL, (gchar **)(void*)display_argv, NULL,
 					 G_SPAWN_DO_NOT_REAP_CHILD |
 					 G_SPAWN_SEARCH_PATH |
 					 G_SPAWN_STDOUT_TO_DEV_NULL |

Modified: trunk/pango-view/viewer-pangocairo.c
==============================================================================
--- trunk/pango-view/viewer-pangocairo.c	(original)
+++ trunk/pango-view/viewer-pangocairo.c	Fri Dec 26 03:22:31 2008
@@ -38,7 +38,7 @@
 
 /* TODO: hinting */
 static gpointer
-pangocairo_view_create (const PangoViewer *klass)
+pangocairo_view_create (const PangoViewer *klass G_GNUC_UNUSED)
 {
   CairoViewer *instance;
 
@@ -279,7 +279,7 @@
 transform_callback (PangoContext *context,
 		    PangoMatrix  *matrix,
 		    gpointer      cr_context,
-		    gpointer      state)
+		    gpointer      state G_GNUC_UNUSED)
 {
   cairo_t *cr = (cairo_t *)cr_context;
   cairo_matrix_t cairo_matrix;
@@ -304,11 +304,11 @@
 }
 
 static void
-pangocairo_view_render (gpointer      instance,
+pangocairo_view_render (gpointer      instance G_GNUC_UNUSED,
 			gpointer      surface,
 			PangoContext *context,
-			int           width,
-			int           height,
+			int           width G_GNUC_UNUSED,
+			int           height G_GNUC_UNUSED,
 			gpointer      state)
 {
   cairo_t *cr;
@@ -355,11 +355,11 @@
 }
 
 static void
-pangocairo_view_write (gpointer instance,
+pangocairo_view_write (gpointer instance G_GNUC_UNUSED,
 		       gpointer surface,
 		       FILE    *stream,
-		       int      width,
-		       int      height)
+		       int      width G_GNUC_UNUSED,
+		       int      height G_GNUC_UNUSED)
 {
   CairoSurface *c_surface = (CairoSurface *) surface;
 

Modified: trunk/pango-view/viewer-pangoft2.c
==============================================================================
--- trunk/pango-view/viewer-pangoft2.c	(original)
+++ trunk/pango-view/viewer-pangoft2.c	Fri Dec 26 03:22:31 2008
@@ -32,7 +32,7 @@
 
 static void
 substitute_func (FcPattern *pattern,
-		 gpointer   data)
+		 gpointer   data G_GNUC_UNUSED)
 {
   if (opt_hinting != HINT_DEFAULT)
     {
@@ -45,7 +45,7 @@
 }
 
 static gpointer
-pangoft2_view_create (const PangoViewer *klass)
+pangoft2_view_create (const PangoViewer *klass G_GNUC_UNUSED)
 {
   PangoFontMap *fontmap;
   fontmap = pango_ft2_font_map_new ();
@@ -69,7 +69,7 @@
 }
 
 static gpointer
-pangoft2_view_create_surface (gpointer instance,
+pangoft2_view_create_surface (gpointer instance G_GNUC_UNUSED,
 			      int      width,
 			      int      height)
 {
@@ -88,7 +88,7 @@
 }
 
 static void
-pangoft2_view_destroy_surface (gpointer instance,
+pangoft2_view_destroy_surface (gpointer instance G_GNUC_UNUSED,
 			       gpointer surface)
 {
   FT_Bitmap *bitmap = (FT_Bitmap *) surface;
@@ -102,7 +102,7 @@
 		 int          x,
 		 int          y,
 		 gpointer     context,
-		 gpointer     state)
+		 gpointer     state G_GNUC_UNUSED)
 {
   pango_ft2_render_layout ((FT_Bitmap *)context,
 			   layout,
@@ -110,11 +110,11 @@
 }
 
 static void
-pangoft2_view_render (gpointer      instance,
+pangoft2_view_render (gpointer      instance G_GNUC_UNUSED,
 		      gpointer      surface,
 		      PangoContext *context,
-		      int           width,
-		      int           height,
+		      int           width G_GNUC_UNUSED,
+		      int           height G_GNUC_UNUSED,
 		      gpointer      state)
 {
   int pix_idx;
@@ -127,13 +127,13 @@
 }
 
 static void
-pangoft2_view_write (gpointer instance,
+pangoft2_view_write (gpointer instance G_GNUC_UNUSED,
 		     gpointer surface,
 		     FILE    *stream,
 		     int      width,
 		     int      height)
 {
-  int row;
+  int row, bytes;
   FT_Bitmap *bitmap = (FT_Bitmap *) surface;
 
   /* Write it as pgm to output */
@@ -142,7 +142,7 @@
 	  "%d %d\n"
 	  "255\n", width, height);
   for (row = 0; row < height; row++)
-    fwrite(bitmap->buffer + row * bitmap->pitch, 1, width, stream);
+    bytes = fwrite(bitmap->buffer + row * bitmap->pitch, 1, width, stream);
 }
 
 const PangoViewer pangoft2_viewer = {

Modified: trunk/pango-view/viewer-pangox.c
==============================================================================
--- trunk/pango-view/viewer-pangox.c	(original)
+++ trunk/pango-view/viewer-pangox.c	Fri Dec 26 03:22:31 2008
@@ -64,7 +64,7 @@
 		 int          x,
 		 int          y,
 		 gpointer     context,
-		 gpointer     state)
+		 gpointer     state G_GNUC_UNUSED)
 {
   MyXContext *x_context = (MyXContext *) context;
 

Modified: trunk/pango-view/viewer-pangoxft.c
==============================================================================
--- trunk/pango-view/viewer-pangoxft.c	(original)
+++ trunk/pango-view/viewer-pangoxft.c	Fri Dec 26 03:22:31 2008
@@ -27,7 +27,7 @@
 
 static void
 default_substitute (FcPattern *pattern,
-		    gpointer   data)
+		    gpointer   data G_GNUC_UNUSED)
 {
   FcPatternDel (pattern, FC_DPI);
   FcPatternAddInteger (pattern, FC_DPI, opt_dpi);
@@ -86,7 +86,7 @@
 		 int          x,
 		 int          y,
 		 gpointer     context,
-		 gpointer     state)
+		 gpointer     state G_GNUC_UNUSED)
 {
   MyXftContext *xft_context = (MyXftContext *) context;
 

Modified: trunk/pango-view/viewer-render.c
==============================================================================
--- trunk/pango-view/viewer-render.c	(original)
+++ trunk/pango-view/viewer-render.c	Fri Dec 26 03:22:31 2008
@@ -365,7 +365,7 @@
 	    int        *value,
 	    const char *name,
 	    const char *arg,
-	    gpointer    data,
+	    gpointer    data G_GNUC_UNUSED,
 	    GError **error)
 {
   char *possible_values = NULL;
@@ -399,7 +399,7 @@
 	     gpointer    data,
 	     GError **error)
 {
-  return parse_enum (PANGO_TYPE_ALIGNMENT, &opt_align,
+  return parse_enum (PANGO_TYPE_ALIGNMENT, (int*)(void*)&opt_align,
 		     name, arg, data, error);
 }
 
@@ -409,7 +409,7 @@
 		gpointer    data,
 		GError **error)
 {
-  return parse_enum (PANGO_TYPE_ELLIPSIZE_MODE, &opt_ellipsize,
+  return parse_enum (PANGO_TYPE_ELLIPSIZE_MODE, (int*)(void*)&opt_ellipsize,
 		     name, arg, data, error);
 }
 
@@ -419,7 +419,7 @@
 	       gpointer    data,
 	       GError **error)
 {
-  return parse_enum (PANGO_TYPE_GRAVITY, &opt_gravity,
+  return parse_enum (PANGO_TYPE_GRAVITY, (int*)(void*)&opt_gravity,
 		     name, arg, data, error);
 }
 
@@ -429,14 +429,14 @@
 		    gpointer    data,
 		    GError **error)
 {
-  return parse_enum (PANGO_TYPE_GRAVITY_HINT, &opt_gravity_hint,
+  return parse_enum (PANGO_TYPE_GRAVITY_HINT, (int*)(void*)&opt_gravity_hint,
 		     name, arg, data, error);
 }
 
 static gboolean
-parse_hinting (const char *name,
+parse_hinting (const char *name G_GNUC_UNUSED,
 	       const char *arg,
-	       gpointer    data,
+	       gpointer    data G_GNUC_UNUSED,
 	       GError    **error)
 {
   gboolean ret = TRUE;
@@ -466,7 +466,7 @@
 	    GError    **error)
 {
   gboolean ret;
-  if ((ret = parse_enum (PANGO_TYPE_WRAP_MODE, &opt_wrap,
+  if ((ret = parse_enum (PANGO_TYPE_WRAP_MODE, (int*)(void*)&opt_wrap,
 			 name, arg, data, error)))
     {
       opt_wrap_set = TRUE;
@@ -523,9 +523,9 @@
 }
 
 static gboolean
-parse_backend (const char *name,
+parse_backend (const char *name G_GNUC_UNUSED,
 	       const char *arg,
-	       gpointer    data,
+	       gpointer    data G_GNUC_UNUSED,
 	       GError    **error)
 {
   gboolean ret = TRUE;
@@ -555,10 +555,10 @@
 
 
 static gboolean
-show_version(const char *name,
-	     const char *arg,
-	     gpointer    data,
-	     GError    **error)
+show_version(const char *name G_GNUC_UNUSED,
+	     const char *arg G_GNUC_UNUSED,
+	     gpointer    data G_GNUC_UNUSED,
+	     GError    **error G_GNUC_UNUSED)
 {
   g_printf("%s (%s) %s\n", prog_name, PACKAGE_NAME, PACKAGE_VERSION);
   g_printf("module interface version: %s\n", MODULE_VERSION);

Modified: trunk/pango-view/viewer-x.c
==============================================================================
--- trunk/pango-view/viewer-x.c	(original)
+++ trunk/pango-view/viewer-x.c	Fri Dec 26 03:22:31 2008
@@ -26,7 +26,7 @@
 
 void
 x_view_init (gpointer           instance,
-	     const PangoViewer *klass)
+	     const PangoViewer *klass G_GNUC_UNUSED)
 {
   XViewer *x = (XViewer *)instance;