提交: d6d52246846b09916ff6d8feb7c1569ec159c0c7 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: d6d52246846b09916ff6d8feb7c1569ec159c0c7 (tree)
• 时间: 2007-03-17 15:32:07
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Pre8: Three crash bugs fixed.

svn path=/trunk/; revision=3634

更改概述

• modified: ChangeLog
• modified: NEWS
• modified: app/textedit.c
• modified: config.h.win32
• modified: configure.in
• modified: doc/en/Makefile.am
• modified: doc/en/dia.1
• modified: doc/en/dia.xml
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml
• modified: plug-ins/pgf/render_pgf.c
• modified: plug-ins/vdx/vdx-import.c

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* NEWS: 
+	* RELEASE-PROCESS: 
+	* config.h.win32: 
+	* doc/en/dia.xml: 
+	* doc/pl/dia.xml: 
+	* doc/eu/dia.xml:
+	* configure.in: Pre8?  Really?  Furrfu!
+
+	* doc/en/Makefile.am (dia.1): Allow net access for getting the
+	XSLT.  Let's see if it causes more problems than it solves.  Fixes
+	bug #391545.
+
+	* app/textedit.c (textedit_remove_focus): Do not free that which
+	has not been allocated (focus!).  Fixes bug #418188.
+
+	* plug-ins/pgf/render_pgf.c (draw_*_with_arrows): Don't
+	assume that the arrow pointers are non-null.  Fixes bug #413309
+
+	* plug-ins/vdx/vdx-import.c: Patch to fix crash bug #417956.
+
 2007-03-14  Steffen Macke <[e-mail]>
 
 	* installer/win32/locale/slovak.nsh: (added)
@@ -7,6 +29,9 @@
 	
 2007-03-11  Lars Clausen  <[e-mail]>
 
+	* widgets.c (get_units_name_list): 
+	* widgets.h: New function to give names of units for prefs.
+
 	* NEWS: 
 	* RELEASE-PROCESS: 
 	* config.h.win32: 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+dia-0.96-pre8: 16-Mar-2007
+
+  * Eighth prerelease for 0.96.  Fixes three crash bugs.
+
 dia-0.96-pre7: 11-Mar-2007
 
   * Seventh prerelease for 0.96. Fixes two crash bugs and image redrawing

--- a/app/textedit.c
+++ b/app/textedit.c
@@ -170,7 +170,6 @@ textedit_remove_focus(DiaObject *obj, Diagram *diagram)
     /* TODO: make sure the focus is deactivated */
     textedit_end_edit(ddisplay_active(), old_focus);
   }
-  g_free(old_focus);
 }
 
 /** Call when the entire list of focusable texts gets reset. */

--- a/config.h.win32
+++ b/config.h.win32
@@ -18,7 +18,7 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
-#define VERSION "0.96-pre7"
+#define VERSION "0.96-pre8"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.96-pre7, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.96-pre8, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -39,7 +39,7 @@ DISTCLEANFILES = dia.1
 # --nonet.  But I don't think that's going to solve more problems
 # than it causes.
 dia.1: dia.dbk
-	xsltproc --nonet --novalid $(DB2MAN) $< >dia.1
+	xsltproc --novalid $(DB2MAN) $< >dia.1
 endif
 
 man_MANS = dia.1

--- a/doc/en/dia.1
+++ b/doc/en/dia.1
@@ -1,189 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "DIA" 1 "2004-11-26" "" ""
-.SH NAME
-dia \- a diagram drawing program
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 4
-\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fIOUTPUT\fR\fR] [\fB\-\-export=\fIOUTPUT\fR\fR] [\fB\-L\ \fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-\-show\-layers=\fILAYER,LAYER,\&.\&.\&.\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fIWxH\fR\fR] [\fB\-\-size=\fIWxH\fR\fR] [\fB\-t\ \fIFORMAT\fR\fR] [\fB\-\-filter=\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \&.\&.\&.]
-.ad
-.hy
-
-.SH "DESCRIPTION"
-
-.PP
-\fBDia\fR is used to create diagrams\&. Dia has a number of basic tools, like lines and boxes but can also dynamically load \fIsheets\fR\&. A sheet is a collection of tools that are used in a certain type of diagram\&.
-
-.PP
-Most diagram objects in \fBDia\fR have \fIconnection points\fR\&. Lines can be connected to these connection points and this way graph structures can be formed\&. When objects are moved or resized the connections will follow the objects\&.
-
-.PP
-Diagrams drawn in \fBDia\fR can be exported PostScript\&.
-
-.SH "OPTIONS"
-
-.PP
-\fBDia\fR accepts the following options:
-
-.TP
-\fB\-c\fR \fB\-\-credits\fR
-Display credits list and exit\&.
-
-.TP
-\fB\-e \fIOUTPUT\fR\fR \fB\-\-export=\fIOUTPUT\fR\fR
-Export loaded file to OUTPUT and exit\&.
-
-.TP
-\fB\-h\fR \fB\-\-help\fR
-Display a list of all commandline options\&.
-
-.TP
-\fB\-n\fR \fB\-\-nosplash\fR
-Do not show the splash screen\&.
-
-.TP
-\fB\-s \fIWxH\fR\fR \fB\-\-size=\fIWxH\fR\fR
-Export loaded file in decimal given width and/or height\&. It is allowed to only select width or height\&. E\&.g\&. \fB\-\-size=\fI520x\fR\fR exports an image that is 520 pixels wide, while \fB\-\-size=\fIx900\fR\fR exports an image of 900 pixels height\&.
-
-.RS
-.Sh "Note"
-This option is currently only implemented for the PNG export filter\&.
-
-.RE
-
-.TP
-\fB\-L \fILAYER,LAYER,\&.\&.\&.\fR\fR \fB\-\-show\-layers=\fILAYER,LAYER,\&.\&.\&.\fR\fR
-Only include specified layers when exporting\&. Layers can be specified either as a layer name, the layer number or a numeric range X\-Y of layers\&. \-\-show\-layers=background,2\-5 shows the layer named background and layers 2\-5, \-\-show\-layers=2\- shows layers 2 and up\&.
-
-.TP
-\fB\-t \fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fIFORMAT\fR\fR
-Export loaded file in FORMAT and exit\&. Format are described below\&.
-
-.TP
-\fB\-v\fR \fB\-\-version\fR
-Display \fBdia\fR version and exit\&.
-
-.SH "EXPORT FORMATS"
-
-.PP
-The following export formats are supported by \fBdia\fR\&.
-
-.TP 3
-\(bu
-cgm (Computer Graphics Metafile, ISO 8632)
-.TP
-\(bu
-dia (Native dia diagram)
-.TP
-\(bu
-dxf (Drawing Interchange File)
-.TP
-\(bu
-eps oreps\-builtin or eps\-pango (Encapsulated PostScript)
-
-The format specifications eps and eps\-pango both use the font renderer of the Pango library, whileeps\-builtin uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try eps\-builtin instead\&.
-.TP
-\(bu
-fig (XFig format)
-.TP
-\(bu
-mp (TeX MetaPost macros)
-.TP
-\(bu
-plt or hpgl (HP Graphics Language)
-.TP
-\(bu
-png (Portable Network Graphics)
-.TP
-\(bu
-shape (Dia Shape File)
-.TP
-\(bu
-svg (Scalable Vector Graphics)
-.TP
-\(bu
-tex (TeX PSTricks macros)
-.TP
-\(bu
-wpg (WordPerfect Graphics)
-.TP
-\(bu
-wmf (Windows MetaFile)
-.LP
-
-.SH "FILES"
-
-.PP
-\fBdia\fR creates a directory \fI\&.dia\fR in the user's home, which contains different files to store user preferences\&. To reset \fBdia\fR to it's default behaviour, just remove the respective file:
-
-.TP 3
-\(bu
-\fIdefaults\&.dia\fR: contains default values for elements (XML format)\&.
-.TP
-\(bu
-\fIdiarc\fR: keeps\fBdia\fR preferences (ASCII)\&.
-.TP
-\(bu
-\fIhistory\fR: keeps the list of last edited diagrams (ASCII)\&.
-.TP
-\(bu
-\fImenurc\fR: contains an automated accelerator map dump (Lisp)\&.
-.TP
-\(bu
-\fIpersistence\fR: contains GUI information, e\&.g\&. open windows (XML)\&.
-.TP
-\(bu
-\fIpluginrc\fR: the list of loaded plugins (XML)\&.
-.LP
-
-.SH "SEE ALSO"
-
-.PP
-Pango: \fIhttp://www.pango.org/\fR
-
-.PP
-X (1)
-
-.PP
-xfig (1)
-
-.PP
-inkscape (1)
-
-.SH "COPYRIGHT"
-
-.PP
-Copyright 1999 Alexander Larsson\&.
-
-.PP
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation\&.
-
-.SH "AUTHORS"
-
-.PP
-Alexander Larsson
-
-.PP
-This manual was written by Fredrik Hallenberg\&.
-
-.SH AUTHORS
-Fredrik Hallenberg, W\&. Borgert, Alan Horkan.

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.96-pre7">
+    <!ENTITY VERSION "0.96-pre8">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -4,7 +4,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
 
-    <!ENTITY VERSION "0.96-pre7">
+    <!ENTITY VERSION "0.96-pre8">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.96-pre7">
+<!ENTITY VERSION "0.96-pre8">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -910,9 +910,21 @@ draw_line_with_arrows(DiaRenderer *self, Point *start, Point *end,
                                   Arrow *start_arrow, Arrow *end_arrow)
 {
     int nat_arr;
-    Arrow st_arrow=*start_arrow;
-    Arrow e_arrow=*end_arrow;
+    Arrow st_arrow;
+    Arrow e_arrow;
     PgfRenderer *renderer = PGF_RENDERER(self);
+
+    if (start_arrow != NULL) {
+	st_arrow = *start_arrow;
+    } else {
+	st_arrow.type = ARROW_NONE;
+    }
+
+    if (end_arrow != NULL) {
+	e_arrow = *end_arrow;
+    } else {
+	e_arrow.type = ARROW_NONE;
+    }
     fprintf(renderer->file, "{\n");
     set_fill_color(renderer, line_color);
     nat_arr = set_arrows(renderer, &st_arrow, &e_arrow);
@@ -936,9 +948,22 @@ draw_arc_with_arrows(DiaRenderer *self, Point *start, Point *end, Point *midpoin
                                  Arrow *start_arrow, Arrow *end_arrow)
 {
     int nat_arr;
-    Arrow st_arrow=*start_arrow;
-    Arrow e_arrow=*end_arrow;
+    Arrow st_arrow;
+    Arrow e_arrow;
     PgfRenderer *renderer = PGF_RENDERER(self);
+
+    if (start_arrow != NULL) {
+	st_arrow = *start_arrow;
+    } else {
+	st_arrow.type = ARROW_NONE;
+    }
+
+    if (end_arrow != NULL) {
+	e_arrow = *end_arrow;
+    } else {
+	e_arrow.type = ARROW_NONE;
+    }
+
     fprintf(renderer->file, "{\n");
     set_fill_color(renderer, color);
     nat_arr = set_arrows(renderer, &st_arrow, &e_arrow);
@@ -959,9 +984,22 @@ draw_polyline_with_arrows(DiaRenderer *self, Point *points, int num_points,
                                      Arrow *start_arrow, Arrow *end_arrow)
 {
     int nat_arr;
-    Arrow st_arrow=*start_arrow;
-    Arrow e_arrow=*end_arrow;
+    Arrow st_arrow;
+    Arrow e_arrow;
     PgfRenderer *renderer = PGF_RENDERER(self);
+
+    if (start_arrow != NULL) {
+	st_arrow = *start_arrow;
+    } else {
+	st_arrow.type = ARROW_NONE;
+    }
+
+    if (end_arrow != NULL) {
+	e_arrow = *end_arrow;
+    } else {
+	e_arrow.type = ARROW_NONE;
+    }
+
     fprintf(renderer->file, "{\n");
     set_fill_color(renderer, color);
     nat_arr = set_arrows(renderer, &st_arrow, &e_arrow);
@@ -982,9 +1020,22 @@ draw_rounded_polyline_with_arrows(DiaRenderer *self,
 				     Arrow *start_arrow, Arrow *end_arrow, real radius)
 {
     int nat_arr;
-    Arrow st_arrow=*start_arrow;
-    Arrow e_arrow=*end_arrow;
+    Arrow st_arrow;
+    Arrow e_arrow;
     PgfRenderer *renderer = PGF_RENDERER(self);
+
+    if (start_arrow != NULL) {
+	st_arrow = *start_arrow;
+    } else {
+	st_arrow.type = ARROW_NONE;
+    }
+
+    if (end_arrow != NULL) {
+	e_arrow = *end_arrow;
+    } else {
+	e_arrow.type = ARROW_NONE;
+    }
+
     fprintf(renderer->file, "{\n");
     set_fill_color(renderer, color);
     nat_arr = set_arrows(renderer, &st_arrow, &e_arrow);
@@ -1007,9 +1058,22 @@ draw_bezier_with_arrows(DiaRenderer *self, BezPoint *points, int num_points,
                                    Arrow *start_arrow, Arrow *end_arrow)
 {
     int nat_arr;
-    Arrow st_arrow=*start_arrow;
-    Arrow e_arrow=*end_arrow;
+    Arrow st_arrow;
+    Arrow e_arrow;
     PgfRenderer *renderer = PGF_RENDERER(self);
+
+    if (start_arrow != NULL) {
+	st_arrow = *start_arrow;
+    } else {
+	st_arrow.type = ARROW_NONE;
+    }
+
+    if (end_arrow != NULL) {
+	e_arrow = *end_arrow;
+    } else {
+	e_arrow.type = ARROW_NONE;
+    }
+
     fprintf(renderer->file, "{\n");
     set_fill_color(renderer, color);
     nat_arr = set_arrows(renderer, &st_arrow, &e_arrow);

--- a/plug-ins/vdx/vdx-import.c
+++ b/plug-ins/vdx/vdx-import.c
@@ -213,10 +213,11 @@ vdx_parse_color(const char *s, const VDXDocument *theDoc)
     {
         /* Look in colour table */
         unsigned int i = atoi(s);
-        if (i < theDoc->Colors->len)
+        if (theDoc->Colors && i < theDoc->Colors->len)
             return g_array_index(theDoc->Colors, Color, i);
     }
-    message_error(_("Couldn't read color: %s\n"), s);
+    message_warning(_("Couldn't read color: %s\n"), s);
+    g_debug("Couldn't read color: %s", s);
     return c;
 }
 
@@ -447,9 +448,14 @@ get_style_child(unsigned int type, unsigned int style, VDXDocument* theDoc)
 {
     struct vdx_StyleSheet theSheet;
     struct vdx_any *Any;
+    if (!theDoc->StyleSheets)
+    {
+        g_debug("Unknown stylesheet reference");
+        return 0;
+    }
     while(1)
     {
-        g_assert(style < theDoc->StyleSheets->len);
+        g_assert(theDoc->StyleSheets && style < theDoc->StyleSheets->len);
         theSheet = g_array_index(theDoc->StyleSheets, 
                                  struct vdx_StyleSheet, style);
         Any = find_child(type, &theSheet);