Commit: 50552bcde9ddeb0861a9f469b55ca7f61cdc70f0 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 50552bcde9ddeb0861a9f469b55ca7f61cdc70f0 (tree)
• Time: 2006-03-23 03:43:01
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

pre6 commit, just a day late:)

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: RELEASE-PROCESS
• modified: config.h.win32
• modified: configure.in
• modified: doc/en/dia.xml
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml
• modified: objects/standard/ellipse.c
• modified: plug-ins/xfig/xfig-import.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* installer/win32/dia.nsi: 
+	* doc/en/dia.xml: 
+	* doc/eu/dia.xml: 
+	* doc/pl/dia.xml: 
+	* config.h.win32: 
+	* configure.in: 
+	* NEWS: -pre6
+
+	* plug-ins/xfig/xfig-import.c: Last missing stack underflow check.
+
 2006-03-19  Hans Breuer  <[e-mail]>
 
 	* app/display.c app/preferences.c : unset transient, still issues

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+dia-0.95-pre6: 21-Mar-2006
+
+* Transient (window-on-top) off till issues resolved.
+
+* Stack corruption errors in XFig import fixed.
+
+* Locale dependency in HPGL file loading removed.
+
 dia-0.95-pre5: 12-Mar-2006
 
 * Fixed positioning and height of UML operations when wrapped.

--- a/RELEASE-PROCESS
+++ b/RELEASE-PROCESS
@@ -24,6 +24,10 @@ When a new version is about to be released:
 
    Make sure to check for open Bugzilla bugs with the PATCH keyword.
 
+   If there are enough changes that a security audit is appropriate
+   (e.g. new or changed importers), there is a standing offer from infamous
+   <[e-mail]> to get audits.
+
 1) The core developers agree on the next version number. It's called
    $VERSION thereafter. They also look if DIA_PLUGIN_API_VERSION needs
    to be updated.
@@ -78,7 +82,7 @@ When a new version is about to be released:
 How to make a tarball
 ---------------------
   1. Update the version number in configure.in, config.h.win32,
-     doc/{en,eu,pl}/dia.xml, doc/en/dia.1.  Also update dia.spec when changing
+     doc/{en,eu,pl}/dia.xml.  Also update dia.spec when changing
      the version number, but not for a change of prerelease number.
   2. Add information about things that have changed to the NEWS file.
   3. make sure you have up to date build tools installed on the system.

--- 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.95-pre5"
+#define VERSION "0.95-pre6"
 
 /*
  * 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.95-pre5, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.95-pre6, 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/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.95-pre5">
+    <!ENTITY VERSION "0.95-pre6">
 
     <!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.95-pre5">
+    <!ENTITY VERSION "0.95-pre6">
 
     <!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.95-pre5">
+<!ENTITY VERSION "0.95-pre6">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -472,9 +472,9 @@ ellipse_copy(Ellipse *ellipse)
   newellipse->aspect = ellipse->aspect;
   newellipse->line_style = ellipse->line_style;
 
-  newobj->handles[8] = &newellipse->center_handle;
   newellipse->center_handle = ellipse->center_handle;
   newellipse->center_handle.connected_to = NULL;
+  newobj->handles[8] = &newellipse->center_handle;
 
   for (i=0;i<9;i++) {
     newobj->connections[i] = &newellipse->connections[i];

--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -696,7 +696,7 @@ fig_read_text_line(FILE *file) {
     return text_buf;
 }
 
-static GList *depths[1000];
+static GList *depths[FIG_MAX_DEPTHS];
 
 /* If there's something in the compound stack, we ignore the depth field,
    as it will be determined by the group anyway */
@@ -1382,7 +1382,7 @@ fig_read_object(FILE *file, DiagramData *dia) {
 	    return FALSE;
 	}
 
-	if (colornumber < 0 || colornumber > FIG_MAX_USER_COLORS) {
+	if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) {
 	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
 			  colornumber, FIG_MAX_USER_COLORS);
 	    return FALSE;