[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 8a3aed69dba718c036659cd0bdab0239b523f357
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 6 17:56:46 2003 +0000

            - fix compile error from B&I Panther build
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer extendUnicodeCharacterToGlyphMapToInclude:]): Rearrange code so that we won't get
            a warning if numGlyphs type is either signed or unsigned. We don't want to depend on the new ATS
            headers or the old ones; this is compatible with both.
            (-[WebTextRenderer extendCharacterToGlyphMapToInclude:]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c3d5507..8333dfc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-06  Darin Adler  <darin at apple.com>
+
+        - fix compile error from B&I Panther build
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer extendUnicodeCharacterToGlyphMapToInclude:]): Rearrange code so that we won't get
+        a warning if numGlyphs type is either signed or unsigned. We don't want to depend on the new ATS
+        headers or the old ones; this is compatible with both.
+        (-[WebTextRenderer extendCharacterToGlyphMapToInclude:]): Ditto.
+
 2003-07-03  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/WebImageRenderer.m: Remove obsolete comment.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index c8c6131..8e6428f 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -1177,7 +1177,8 @@ static const char *joiningNames[] = {
 
     ATSInitializeGlyphVector(count*2, 0, &glyphVector);
     [self convertUnicodeCharacters: &buffer[0] length: count toGlyphs: &glyphVector];
-    if (glyphVector.numGlyphs != count)
+    int numGlyphs = glyphVector.numGlyphs;
+    if (numGlyphs != count)
         [NSException raise:NSInternalInconsistencyException format:@"surrogate matching violation:  count and glyphID count not equal - for %@ %f", self, [font displayName], [font pointSize]];
             
     map->glyphs = (GlyphEntry *)malloc (count * sizeof(GlyphEntry));
@@ -1249,7 +1250,8 @@ static const char *joiningNames[] = {
 
     ATSInitializeGlyphVector(count, 0, &glyphVector);
     [self convertCharacters: &buffer[0] length: count toGlyphs: &glyphVector skipControlCharacters: NO];
-    if (glyphVector.numGlyphs != count)
+    int numGlyphs = glyphVector.numGlyphs;
+    if (numGlyphs != count)
         [NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation:  count and glyphID count not equal - for %@ %f", self, [font displayName], [font pointSize]];
             
     map->glyphs = (GlyphEntry *)malloc (count * sizeof(GlyphEntry));

-- 
WebKit Debian packaging