Commit: abd2ecc3aec25265b4fdee5809dffd30027ade33 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: abd2ecc3aec25265b4fdee5809dffd30027ade33 (tree)
• Time: 2004-08-02 03:14:52
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Two fixes, and a new prerelease

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/app_procs.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia.xml
• modified: doc/pl/dia.xml
• modified: lib/font.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* NEWS: 
+	* configure.in: 
+	* dia.spec (Release): 
+	* config.h.win32: 
+	* doc/pl/dia.xml: 
+	* doc/en/dia.xml: Prerelease 4.
+
+	* lib/font.c (dia_font_build_layout): Better comparision and
+	freeing of font cache.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* lib/font.c (dia_font_build_layout): Faster update to avoid
+	memory leaks.
+
+	* app/app_procs.c: Fix from Tom Parker <[e-mail]>:
+	Correctly initialize export filter variable.
+
 2004-07-25  Lars Clausen  <[e-mail]>
 
 	* dia.spec (Release): 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+dia-0.94-pre4: 1-Aug-2004
+
+Important fix for export filters.  Still some leaking from layout cache,
+but not as awful.
+
 dia-0.94-pre3: 25-Jul-2004
 
 Fixing a number of png issues and a few bugs.

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -290,7 +290,7 @@ handle_initial_diagram(const char *in_file_name,
 
   if (export_file_format) {
     char *export_file_name = NULL;
-    DiaExportFilter *ef;
+    DiaExportFilter *ef = NULL;
 
     /* First try guessing based on extension */
     export_file_name = build_output_file_name(in_file_name,

--- a/config.h.win32
+++ b/config.h.win32
@@ -17,7 +17,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.94-pre3"
+#define VERSION "0.94-pre4"
 
 /*
  * 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.94-pre3, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.94-pre4, 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/dia.spec
+++ b/dia.spec
@@ -6,7 +6,7 @@ Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: pre3
+Release: pre4
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.94-pre3">
+    <!ENTITY VERSION "0.94-pre4">
 
     <!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.94-pre3">
+<!ENTITY VERSION "0.94-pre4">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/lib/font.c
+++ b/lib/font.c
@@ -524,7 +524,7 @@ layout_cache_equals(gconstpointer e1, gconstpointer e2)
 
   return strcmp(i1->string, i2->string) == 0 &&
     fabs(i1->height - i2->height) < 0.00001 &&
-    i1->font == i2->font;
+    pango_font_description_equal(i1->font->pfd, i2->font->pfd);
 }
 
 static guint
@@ -534,7 +534,7 @@ layout_cache_hash(gconstpointer el)
 
   return g_str_hash(item->string) ^
     (int)(item->height*1000) ^
-    (int)(item->font);
+    (int)(item->font->pfd);
 }
 
 static long layout_cache_last_use;
@@ -556,7 +556,6 @@ layout_cache_cleanup_idle(gpointer data)
   GHashTable *table = (GHashTable*)(data);
 
   g_hash_table_foreach_remove(table, layout_cache_cleanup_entry, NULL);
-
   return FALSE;
 }
 
@@ -567,7 +566,7 @@ static gboolean
 layout_cache_cleanup(gpointer data)
 {
   /* Only cleanup if there has been font activity since last cleanup */
-  if (time(0) - layout_cache_last_use < 60*10) {
+  if (time(0) - layout_cache_last_use < 10) {
     /* Don't go directly to cleanup, wait till there's a pause. */
     g_idle_add(layout_cache_cleanup_idle, data);
   }
@@ -586,7 +585,7 @@ layout_cache_free_key(gpointer data)
     }
 
     if (item->font != NULL) {
-      g_object_unref(item->font);
+      dia_font_unref(item->font);
       item->font = NULL;
     }
 
@@ -616,7 +615,13 @@ dia_font_build_layout(const char* string, DiaFont* font, real height)
 					  layout_cache_equals,
 					  layout_cache_free_key,
 					  NULL);
-      g_timeout_add(10*60*1000, layout_cache_cleanup, (gpointer)layoutcache);
+      /** Check for cache cleanup every 10 seconds. */
+      /** This frequent a check is really a hack while we figure out the
+       *  exact problems with reffing the fonts.
+       *  Note to self:  The equals function should compare pfd's, but
+       *  then DiaFonts are freed too early. 
+       */
+      g_timeout_add(10*1000, layout_cache_cleanup, (gpointer)layoutcache);
     } else {
       LayoutCacheItem item;
       item.string = string;
@@ -633,7 +638,7 @@ dia_font_build_layout(const char* string, DiaFont* font, real height)
     cached = g_new0(LayoutCacheItem,1);
     cached->string = g_strdup(string);
     cached->font = font;
-    g_object_ref(font);
+    dia_font_ref(font);
     cached->height = height;
 
     height *= 0.7;
@@ -673,7 +678,7 @@ dia_font_build_layout(const char* string, DiaFont* font, real height)
     cached->layout = layout;
     g_object_ref(layout);
     cached->usecount = 1;
-    g_hash_table_insert(layoutcache, cached, cached);
+    g_hash_table_replace(layoutcache, cached, cached);
 
     return layout;
 }