dia r4189 - trunk/lib

[hans svn gnome org]

Author: hans
Date: Sun Jan 11 20:02:38 2009
New Revision: 4189
URL: http://svn.gnome.org/viewvc/dia?rev=4189&view=rev

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

	* lib/dia_svg.c(read_text_svg) : support for text alignment, less warnings
	and text colors corrected even for DIA_SVG_COLOUR_NONE
	(read_items) : switched from if-continue to a more common if-else-if
	* plug-ins/svg/svg-import.c : use DIA_SVG_COLOUR_NONE instead of (-1)




Modified:
   trunk/lib/dia_svg.c

Modified: trunk/lib/dia_svg.c
==============================================================================
--- trunk/lib/dia_svg.c	(original)
+++ trunk/lib/dia_svg.c	Sun Jan 11 20:02:38 2009
@@ -39,11 +39,11 @@
 dia_svg_style_init(DiaSvgStyle *gs, DiaSvgStyle *parent_style)
 {
   g_return_if_fail (gs);
-  gs->stroke = parent_style ? parent_style->stroke : (-1);
+  gs->stroke = parent_style ? parent_style->stroke : DIA_SVG_COLOUR_NONE;
   gs->line_width = parent_style ? parent_style->line_width : 0.0;
   gs->linestyle = parent_style ? parent_style->linestyle : LINESTYLE_SOLID;
   gs->dashlength = parent_style ? parent_style->dashlength : 1;
-  gs->fill = parent_style ? parent_style->fill : (-1);
+  gs->fill = parent_style ? parent_style->fill : DIA_SVG_COLOUR_NONE;
   gs->linecap = parent_style ? parent_style->linecap : DIA_SVG_LINECAPS_DEFAULT;
   gs->linejoin = parent_style ? parent_style->linejoin : DIA_SVG_LINEJOIN_DEFAULT;
   gs->linestyle = parent_style ? parent_style->linestyle : DIA_SVG_LINESTYLE_DEFAULT;