dia r3900 - in trunk: . lib objects/standard po

[hans svn gnome org]

Author: hans
Date: Wed Mar  5 16:44:46 2008
New Revision: 3900
URL: http://svn.gnome.org/viewvc/dia?rev=3900&view=rev

Log:
2008-03-05  Hans Breuer  <hans breuer org>

	* lib/font.c lib/focus.c lib/diagdkrenderer.c
	  objects/standard/arc.c object/standard/outline.c : less warnings
	by (re)moving (dead|some) code
	  
	* objects/standard/Makefile.am : remove whitespace after '\'
	* po/POTFILES.in : now really removed app/diaconv.c



Modified:
   trunk/ChangeLog
   trunk/lib/diagdkrenderer.c
   trunk/lib/focus.c
   trunk/lib/font.c
   trunk/objects/standard/Makefile.am
   trunk/objects/standard/arc.c
   trunk/objects/standard/outline.c
   trunk/po/POTFILES.in

Modified: trunk/lib/diagdkrenderer.c
==============================================================================
--- trunk/lib/diagdkrenderer.c	(original)
+++ trunk/lib/diagdkrenderer.c	Wed Mar  5 16:44:46 2008
@@ -651,22 +651,6 @@
   ftbitmap->palette_mode = 0;
   ftbitmap->palette = 0;
 }
-
-typedef struct _FreetypeCacheData {
-  int x;
-  int y;
-  int width;
-  int height;
-  GdkPixbuf *rgba;
-} FreetypeCacheData;
-
-static void
-free_freetype_cache_data(gpointer data) {
-  FreetypeCacheData *ftdata = (FreetypeCacheData*) data;
-  
-  g_object_unref(ftdata->rgba);
-  g_free(ftdata);
-}
 #endif
 
 /** Draw a TextLine object.
@@ -713,7 +697,7 @@
 
     layout = dia_font_build_layout(text, text_line->font,
 				   dia_transform_length(renderer->transform, text_line->height)/20.0);
-#ifdef PANGO_VERSION_ENCODE && (PANGO_VERSION >= PANGO_VERSION_ENCODE(1,16,0))
+#if defined PANGO_VERSION_ENCODE && (PANGO_VERSION >= PANGO_VERSION_ENCODE(1,16,0))
     /* I'd say the former Pango API was broken, i.e. leaky */
     text_line_adjust_layout_line(text_line, pango_layout_get_line_readonly(layout, 0),
 				scale/20.0);

Modified: trunk/lib/focus.c
==============================================================================
--- trunk/lib/focus.c	(original)
+++ trunk/lib/focus.c	Wed Mar  5 16:44:46 2008
@@ -30,9 +30,6 @@
 #include "diagramdata.h"
 #include "object.h"
 
-static Focus *active_focus_ptr = NULL;
-static GList *text_foci = NULL;
-
 /** Returns the list of foci for the given diagram */
 static GList *
 get_text_foci(DiagramData *dia)
@@ -213,3 +210,4 @@
   }
   return active;
 }
+

Modified: trunk/lib/font.c
==============================================================================
--- trunk/lib/font.c	(original)
+++ trunk/lib/font.c	Wed Mar  5 16:44:46 2008
@@ -712,7 +712,7 @@
   real top, bline, bottom;
   const gchar* non_empty_string;
   PangoRectangle ink_rect,logical_rect;
-  real* offsets;
+  real* offsets = NULL; /* avoid: 'offsets' may be used uninitialized in this function */
 
   /* We need some reasonable ascent/descent values even for empty strings. */
   if (string == NULL || string[0] == '\0') {
@@ -734,7 +734,7 @@
   get_string_offsets(iter, &offsets, n_offsets);
   get_layout_offsets(pango_layout_get_line(layout, 0), layout_offsets);
 
-  /* FIXME: the above assumption of 'one line'  is wrong. At least calculate the overall width correctly
+  /* FIXME: the above assumption of 'one line' is wrong. At least calculate the overall width correctly
    * to avoid text overflowing its box, like in bug #482585 */
   while (pango_layout_iter_next_line (iter)) {
     PangoRectangle more_ink_rect, more_logical_rect;

Modified: trunk/objects/standard/Makefile.am
==============================================================================
--- trunk/objects/standard/Makefile.am	(original)
+++ trunk/objects/standard/Makefile.am	Wed Mar  5 16:44:46 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 pkglib_LTLIBRARIES = 	libstandard_objects.la
-libstandard_objects_la_SOURCES = \	
+libstandard_objects_la_SOURCES = \
 	arc.c \
 	box.c \
 	ellipse.c \

Modified: trunk/objects/standard/arc.c
==============================================================================
--- trunk/objects/standard/arc.c	(original)
+++ trunk/objects/standard/arc.c	Wed Mar  5 16:44:46 2008
@@ -542,11 +542,11 @@
 #ifdef TRACE_DIST
   real trace[MAXITER];
   real disttrace[MAXITER];
+  int j = 0;
 #endif
   real mid1, mid2, mid3;
   real dist;
   int i = 0;
-  int j = 0;
 
   mid1 = ang_start;
   mid2 = get_middle_arc_angle(ang_start, ang_end, clockwiseness);

Modified: trunk/objects/standard/outline.c
==============================================================================
--- trunk/objects/standard/outline.c	(original)
+++ trunk/objects/standard/outline.c	Wed Mar  5 16:44:46 2008
@@ -73,8 +73,6 @@
 				  Handle **handle2);
 static void outline_save (Outline *outline, ObjectNode obj_node, 
                           const char *filename);
-static DiaObject *outline_load (ObjectNode obj_node, int version, 
-                                const char *filename);
 
 static ObjectTypeOps outline_type_ops =
 {

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Mar  5 16:44:46 2008
@@ -8,7 +8,6 @@
 app/dia-props.c
 app/dia_embedd.c
 app/diacanvas.c
-app/diaconv.c
 app/diagram.c
 app/diagram_tree.c
 app/diagram_tree_menu.c