[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit c034692f1aaef7354aae621446e8ff9654f3c64e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 10 04:40:36 2002 +0000

    	* WebCoreSupport.subproj/IFTextRenderer.m:
    	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
    	Fixed a possible uninitialized variable problem that the compiler and Don caught.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ca7be4f..4eee3ae 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,12 @@
 
 	* WebCoreSupport.subproj/IFTextRenderer.m:
 	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	Fixed a possible uninitialized variable problem that the compiler and Don caught.
+
+2002-06-09  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
 	Add code to handle drawing when are more than LOCAL_GLYPH_BUFFER_SIZE advances.
 	I ran into this loading <http://jersey.apple.com/data/20020606-074404M0.html>.
 	Also fix handling of advances for the obscure case where we hit a non-base character,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ca7be4f..4eee3ae 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -2,6 +2,12 @@
 
 	* WebCoreSupport.subproj/IFTextRenderer.m:
 	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	Fixed a possible uninitialized variable problem that the compiler and Don caught.
+
+2002-06-09  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
 	Add code to handle drawing when are more than LOCAL_GLYPH_BUFFER_SIZE advances.
 	I ran into this loading <http://jersey.apple.com/data/20020606-074404M0.html>.
 	Also fix handling of advances for the obscure case where we hit a non-base character,
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 46afc44..6def991 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -536,15 +536,16 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
     CGContextShowGlyphsWithDeviceAdvances (cgContext, glyphs, advances, numGlyphs);
 #endif
     
-cleanup:
-    if (glyphs != localGlyphBuffer) {
-        free(glyphs);
-    }
 #ifndef DRAW_WITHOUT_ADVANCE
     if (advances != localAdvanceBuffer) {
         free(advances);
     }
 #endif
+
+cleanup:
+    if (glyphs != localGlyphBuffer) {
+        free(glyphs);
+    }
 }
 
 
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 46afc44..6def991 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -536,15 +536,16 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
     CGContextShowGlyphsWithDeviceAdvances (cgContext, glyphs, advances, numGlyphs);
 #endif
     
-cleanup:
-    if (glyphs != localGlyphBuffer) {
-        free(glyphs);
-    }
 #ifndef DRAW_WITHOUT_ADVANCE
     if (advances != localAdvanceBuffer) {
         free(advances);
     }
 #endif
+
+cleanup:
+    if (glyphs != localGlyphBuffer) {
+        free(glyphs);
+    }
 }
 
 

-- 
WebKit Debian packaging