dia r4223 - in trunk: . plug-ins plug-ins/drs po

[hans svn gnome org]

Author: hans
Date: Sat Jan 24 14:52:45 2009
New Revision: 4223
URL: http://svn.gnome.org/viewvc/dia?rev=4223&view=rev

Log:
2009-01-24  Hans Breuer  <hans breuer org>

	* configure.in plug-ins/Makefile.am plug-ins/drs/Makefile.am : build
	drs on *NIX, too. But do not install it.
	plug-ins/drs/*.[hc] : now warnings with gcc except defined but not used
	* po/POTFILES.in : not much to translate, just silence 'make distcheck'


Added:
   trunk/plug-ins/drs/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plug-ins/Makefile.am
   trunk/plug-ins/drs/dia-render-script-import.c
   trunk/plug-ins/drs/dia-render-script-renderer.c
   trunk/plug-ins/drs/dia-render-script-renderer.h
   trunk/plug-ins/drs/dia-render-script.c
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jan 24 14:52:45 2009
@@ -571,6 +571,7 @@
 plug-ins/Makefile
 plug-ins/cgm/Makefile
 plug-ins/cairo/Makefile
+plug-ins/drs/Makefile
 plug-ins/dxf/Makefile
 plug-ins/hpgl/Makefile
 plug-ins/libart/Makefile

Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am	(original)
+++ trunk/plug-ins/Makefile.am	Sat Jan 24 14:52:45 2009
@@ -1,6 +1,7 @@
 # Remember to also add subdirs in configure.in
 SUBDIRS = cgm cairo pstricks hpgl wpg svg shape dxf python xfig \
-	  wmf libart metapost xslt pixbuf pgf vdx postscript
+	  wmf libart metapost xslt pixbuf pgf vdx postscript \
+	  drs
 
 EXTRA_DIST = \
 	makefile.msc objects.def

Added: trunk/plug-ins/drs/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/plug-ins/drs/Makefile.am	Sat Jan 24 14:52:45 2009
@@ -0,0 +1,24 @@
+
+plugin_sources = \
+	dia-render-script.c \
+	dia-render-script-import.c \
+	dia-render-script-object.c \
+	dia-render-script-renderer.c \
+	dia-render-script-renderer.h
+
+pkglib_LTLIBRARIES = libdrs_filter.la
+
+EXTRA_DIST = \
+	dia-render-script.dtd
+
+libdrs_filter_la_SOURCES = $(plugin_sources)
+
+libdrs_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libdrs_filter_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
+
+INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS)
+
+# Prevent installation - currently a debug tool only
+install-pkglibLTLIBRARIES:
+	:
+

Modified: trunk/plug-ins/drs/dia-render-script-import.c
==============================================================================
--- trunk/plug-ins/drs/dia-render-script-import.c	(original)
+++ trunk/plug-ins/drs/dia-render-script-import.c	Sat Jan 24 14:52:45 2009
@@ -60,7 +60,7 @@
       Point *pt = &g_array_index(arr, Point, i);
       
       pt->x = g_strtod (val, &ep);
-      pt->y = ep ? g_strtod (++ep, &ep) : 0;
+      pt->y = ep ? ++ep, g_strtod (ep, &ep) : 0;
     }
     g_strfreev(split);
     xmlFree(str);
@@ -87,11 +87,11 @@
       ep = (gchar *)str + 1;
       
       pt->p1.x = ep ? g_strtod (ep, &ep) : 0;
-      pt->p1.y = ep ? g_strtod (++ep, &ep) : 0;
-      pt->p2.x = ep ? g_strtod (++ep, &ep) : 0;
-      pt->p2.y = ep ? g_strtod (++ep, &ep) : 0;
-      pt->p3.x = ep ? g_strtod (++ep, &ep) : 0;
-      pt->p3.y = ep ? g_strtod (++ep, &ep) : 0;
+      pt->p1.y = ep ? ++ep, g_strtod (ep, &ep) : 0;
+      pt->p2.x = ep ? ++ep, g_strtod (ep, &ep) : 0;
+      pt->p2.y = ep ? ++ep, g_strtod (ep, &ep) : 0;
+      pt->p3.x = ep ? ++ep, g_strtod (ep, &ep) : 0;
+      pt->p3.y = ep ? ++ep, g_strtod (ep, &ep) : 0;
     }    
     g_strfreev(split);
     xmlFree(str);

Modified: trunk/plug-ins/drs/dia-render-script-renderer.c
==============================================================================
--- trunk/plug-ins/drs/dia-render-script-renderer.c	(original)
+++ trunk/plug-ins/drs/dia-render-script-renderer.c	Sat Jan 24 14:52:45 2009
@@ -292,7 +292,7 @@
 {
   DrsRenderer *renderer = DRS_RENDERER (self);
   xmlNodePtr node;
-  const gchar *value;
+  const gchar *value = NULL;
 
   /* line type */
   switch (mode) {
@@ -408,9 +408,9 @@
                      (const xmlChar *)(fill ? "fill-polygon" : "draw-polygon"), NULL);
   _node_set_points (node, points, num_points);
   if (fill)
-    _node_set_color (node, (const xmlChar *)"fill", color);
+    _node_set_color (node, "fill", color);
   else
-    _node_set_color (node, (const xmlChar *)"stroke", color);
+    _node_set_color (node, "stroke", color);
 }
 static void
 draw_polygon(DiaRenderer *self, 
@@ -446,11 +446,11 @@
   _node_set_point (node, "lefttop", lefttop);
   _node_set_point (node, "rightbottom", rightbottom);
   if (rounding)
-    _node_set_real (node, (const xmlChar *)"r", *rounding);
+    _node_set_real (node, "r", *rounding);
   if (fill)
-    _node_set_color (node, (const xmlChar *)"fill", color);
+    _node_set_color (node, "fill", color);
   else
-    _node_set_color (node, (const xmlChar *)"stroke", color);
+    _node_set_color (node, "stroke", color);
 }
 static void
 draw_rect(DiaRenderer *self, 
@@ -604,7 +604,7 @@
   
   node = xmlNewChild (renderer->root, NULL, (const xmlChar *)"draw-rounded-polyline", NULL);
   _node_set_points (node, points, num_points);
-  _node_set_color (node, (const xmlChar *)"stroke", color);
+  _node_set_color (node, "stroke", color);
   _node_set_real (node, "r", radius);
 }
 

Modified: trunk/plug-ins/drs/dia-render-script-renderer.h
==============================================================================
--- trunk/plug-ins/drs/dia-render-script-renderer.h	(original)
+++ trunk/plug-ins/drs/dia-render-script-renderer.h	Sat Jan 24 14:52:45 2009
@@ -52,6 +52,4 @@
   DiaRendererClass parent_class;
 };
 
-void drs_render_layer (DiaRenderer *self, Layer *layer);
-
 G_END_DECLS

Modified: trunk/plug-ins/drs/dia-render-script.c
==============================================================================
--- trunk/plug-ins/drs/dia-render-script.c	(original)
+++ trunk/plug-ins/drs/dia-render-script.c	Sat Jan 24 14:52:45 2009
@@ -53,7 +53,7 @@
 
 #define G_LOG_DOMAIN "DiaRenderScript"
 #include <glib.h>
-#include <gstdio.h>
+#include <glib/gstdio.h>
 
 #include "intl.h"
 #include "filter.h"

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sat Jan 24 14:52:45 2009
@@ -179,6 +179,11 @@
 plug-ins/cairo/diacairo-interactive.c
 plug-ins/cairo/diacairo.c
 plug-ins/cgm/cgm.c
+plug-ins/drs/dia-render-script-import.c
+plug-ins/drs/dia-render-script-object.c
+plug-ins/drs/dia-render-script-renderer.c
+plug-ins/drs/dia-render-script-renderer.h
+plug-ins/drs/dia-render-script.c
 plug-ins/dxf/dxf-export.c
 plug-ins/dxf/dxf-import.c
 plug-ins/dxf/dxf.c