Fix a Wx build error.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 17:56:30 +0000 (17:56 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2008 17:56:30 +0000 (17:56 +0000)
        * platform/graphics/wx/GlyphMapWx.cpp:
        (WebCore::GlyphPage::fill):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/wx/GlyphMapWx.cpp

index 874cf836b5bd3dec925f5f505194eb8414d5a6d2..39cbb9cfbe25b760ab172acfe1fc303a87964aff 100644 (file)
@@ -1,3 +1,10 @@
+2008-01-08  Dan Bernstein  <mitz@apple.com>
+
+        Fix a Wx build error.
+
+        * platform/graphics/wx/GlyphMapWx.cpp:
+        (WebCore::GlyphPage::fill):
+
 2008-01-08  Dan Bernstein  <mitz@apple.com>
 
         Fix a Qt build error.
index 5213d6d4935d5d3c27adb425f2d597e4f87947dc..ebf86e4dd304a433a82a2adebce104c3aa0114a3 100755 (executable)
 namespace WebCore
 {
 
-bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
+bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
 {
-    bool isUtf16 = bufferLength != GlyphPage::size;
+    bool isUtf16 = bufferLength != length;
 
-    for (unsigned i = 0; i < GlyphPage::size; i++) {
+    for (unsigned i = 0; i < length; i++) {
         UChar32 character;
 
         if(isUtf16) {
@@ -50,7 +50,7 @@ bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const SimpleFontData*
             character = buffer[i];
         }
 
-        setGlyphDataForIndex(i, character, fontData);
+        setGlyphDataForIndex(offset + i, character, fontData);
     }
 
     return true;