Title: [151387] releases/WebKitGTK/webkit-2.0/Source/WebCore
Revision
151387
Author
[email protected]
Date
2013-06-10 06:02:15 -0700 (Mon, 10 Jun 2013)

Log Message

Merge r151141 - [harfbuzz] WebKit fails to build with MinGW compiler because of invalid cast in HarfBuzzShaper.cpp
https://bugs.webkit.org/show_bug.cgi?id=108373

Patch by PaweÅ‚ Forysiuk <[email protected]> on 2013-06-03
Reviewed by Darin Adler.

Fix building on platforms where UChar is defined as wchar_t.

* platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
(WebCore::HarfBuzzShaper::shapeHarfBuzzRuns):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (151386 => 151387)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-06-10 12:57:52 UTC (rev 151386)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-06-10 13:02:15 UTC (rev 151387)
@@ -1,3 +1,16 @@
+2013-06-03  PaweÅ‚ Forysiuk  <[email protected]>
+
+        [harfbuzz] WebKit fails to build with MinGW compiler because of invalid cast in HarfBuzzShaper.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=108373
+
+        Reviewed by Darin Adler.
+
+        Fix building on platforms where UChar is defined as wchar_t.
+
+
+        * platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
+        (WebCore::HarfBuzzShaper::shapeHarfBuzzRuns):
+
 2013-05-18  Alberto Garcia  <[email protected]>
 
         [GTK] Parallel build fails if gtk-doc is enabled

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (151386 => 151387)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp	2013-06-10 12:57:52 UTC (rev 151386)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp	2013-06-10 13:02:15 UTC (rev 151387)
@@ -342,9 +342,9 @@
             String upperText = String(m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters());
             upperText.makeUpper();
             currentFontData = m_font->glyphDataForCharacter(upperText[0], false, SmallCapsVariant).fontData;
-            hb_buffer_add_utf16(harfBuzzBuffer.get(), upperText.characters(), currentRun->numCharacters(), 0, currentRun->numCharacters());
+            hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(upperText.characters()), currentRun->numCharacters(), 0, currentRun->numCharacters());
         } else
-            hb_buffer_add_utf16(harfBuzzBuffer.get(), m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters(), 0, currentRun->numCharacters());
+            hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(m_normalizedBuffer.get() + currentRun->startIndex()), currentRun->numCharacters(), 0, currentRun->numCharacters());
 
         FontPlatformData* platformData = const_cast<FontPlatformData*>(&currentFontData->platformData());
         HarfBuzzFace* face = platformData->harfBuzzFace();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to