提交: 63e66598aa7df29a657dfa16304330596b1386bf - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: 63e66598aa7df29a657dfa16304330596b1386bf (tree)
• 時間: 2009-10-06 05:08:10
• 作者: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Log Message

Bug #591525 - fix opacitiy export of standard SVG renderer

Need to write fill-opacitiy and stroke-opacitiy as non localized double.

Change Summary

• modified: lib/diasvgrenderer.c

差異

--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -221,12 +221,15 @@ get_draw_style(DiaSvgRenderer *renderer,
 {
   static GString *str = NULL;
   gchar linewidth_buf[DTOSTR_BUF_SIZE];
+  gchar alpha_buf[DTOSTR_BUF_SIZE];
 
   if (!str) str = g_string_new(NULL);
   g_string_truncate(str, 0);
 
   /* TODO(CHECK): the shape-export didn't have 'fill: none' here */
-  g_string_printf(str, "fill: none; fill-opacity: %f; stroke-width: %s", colour->alpha, dia_svg_dtostr(linewidth_buf, renderer->linewidth) );
+  g_string_printf(str, "fill: none; stroke-opacity: %s; stroke-width: %s", 
+		  g_ascii_formatd (alpha_buf, sizeof(alpha_buf), "%g", colour->alpha), 
+		  dia_svg_dtostr(linewidth_buf, renderer->linewidth) );
   if (strcmp(renderer->linecap, "butt"))
     g_string_append_printf(str, "; stroke-linecap: %s", renderer->linecap);
   if (strcmp(renderer->linejoin, "miter"))
@@ -248,12 +251,14 @@ get_fill_style(DiaSvgRenderer *renderer,
 	       Color *colour)
 {
   static GString *str = NULL;
+  gchar alpha_buf[DTOSTR_BUF_SIZE];
 
   if (!str) str = g_string_new(NULL);
 
-  g_string_printf(str, "fill: #%02x%02x%02x; fill-opacity: %f",
+  g_string_printf(str, "fill: #%02x%02x%02x; fill-opacity: %s",
 		   (int)ceil(255*colour->red), (int)ceil(255*colour->green),
-		   (int)ceil(255*colour->blue), colour->alpha);
+		   (int)ceil(255*colour->blue), 
+		   g_ascii_formatd(alpha_buf, sizeof(alpha_buf), "%g", colour->alpha));
 
   return str->str;
 }