[Gnash-commit] gnash ./ChangeLog server/font.cpp

[Michael Carlson]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Michael Carlson <address@hidden>        06/01/23 15:32:07

Modified files:
        .              : ChangeLog 
        server         : font.cpp 

Log message:
        Report an error and continue when we get two of the same kerning pairs 
for a font, instead of crashing

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/font.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.30 gnash/ChangeLog:1.31
--- gnash/ChangeLog:1.30        Sat Jan 21 17:08:40 2006
+++ gnash/ChangeLog     Mon Jan 23 15:32:07 2006
@@ -1,3 +1,8 @@
+2006-01-23 Michael Carlson <address@hidden>
+
+        * server/font.cpp: Report an error and continue when we get two
+       of the same kerning pairs for a font, instead of crashing
+
 2006-01-21  Rob Savoye  <address@hidden>
 
        * configure.ac: Add tests for OGG and Vorbis.
Index: gnash/server/font.cpp
diff -u gnash/server/font.cpp:1.1 gnash/server/font.cpp:1.2
--- gnash/server/font.cpp:1.1   Tue Dec 20 21:01:18 2005
+++ gnash/server/font.cpp       Mon Jan 23 15:32:07 2006
@@ -281,7 +281,10 @@
 
                                        // Remember this adjustment; we can 
look it up quickly
                                        // later using the character pair as 
the key.
-                                       m_kerning_pairs.add(k, adjustment);
+                                       if (m_kerning_pairs.find(k) == 
m_kerning_pairs.end())
+                                               m_kerning_pairs.add(k, 
adjustment);
+                                       else
+                                               
IF_VERBOSE_PARSE(log_error("Error in font::read() -- Repeated kerning pair 
found - ignoring\n"));
                                }}
                        }
                }