The following commit has been merged in the debian/unstable branch:
commit 1ac1d271e53047cc845231e5528f0b34b3b73c31
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 7 18:13:14 2003 +0000
Reviewed by Dave.
- fix compile error from B&I Panther build; really, this time
* WebCoreSupport.subproj/WebTextRenderer.m:
(-[WebTextRenderer extendUnicodeCharacterToGlyphMapToInclude:]): Use unsigned, not int.
(-[WebTextRenderer extendCharacterToGlyphMapToInclude:]): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8333dfc..888d92c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-07 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - fix compile error from B&I Panther build; really, this time
+
+ * WebCoreSupport.subproj/WebTextRenderer.m:
+ (-[WebTextRenderer extendUnicodeCharacterToGlyphMapToInclude:]): Use unsigned, not int.
+ (-[WebTextRenderer extendCharacterToGlyphMapToInclude:]): Ditto.
+
2003-07-06 Darin Adler <darin at apple.com>
- fix compile error from B&I Panther build
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 8e6428f..ebf6731 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -1177,7 +1177,7 @@ static const char *joiningNames[] = {
ATSInitializeGlyphVector(count*2, 0, &glyphVector);
[self convertUnicodeCharacters: &buffer[0] length: count toGlyphs: &glyphVector];
- int numGlyphs = glyphVector.numGlyphs;
+ unsigned 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]];
@@ -1250,7 +1250,7 @@ static const char *joiningNames[] = {
ATSInitializeGlyphVector(count, 0, &glyphVector);
[self convertCharacters: &buffer[0] length: count toGlyphs: &glyphVector skipControlCharacters: NO];
- int numGlyphs = glyphVector.numGlyphs;
+ unsigned 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]];
--
WebKit Debian packaging