diff options
Diffstat (limited to 'WebCore/platform/text')
| -rw-r--r-- | WebCore/platform/text/TextCodecLatin1.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/text/qt/TextCodecQt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/text/TextCodecLatin1.cpp b/WebCore/platform/text/TextCodecLatin1.cpp index 4f9cbe0..2a217c5 100644 --- a/WebCore/platform/text/TextCodecLatin1.cpp +++ b/WebCore/platform/text/TextCodecLatin1.cpp @@ -164,7 +164,7 @@ String TextCodecLatin1::decode(const char* bytes, size_t length, bool, bool, boo // Wait until we're at a properly aligned address, then read full CPU words. if (!(reinterpret_cast<ptrdiff_t>(src) & (sizeof(uintptr_t) - 1))) { while (src < alignedEnd) { - uintptr_t chunk = *reinterpret_cast<const uintptr_t*>(src); + uintptr_t chunk = *reinterpret_cast_ptr<const uintptr_t*>(src); if (chunk & NonASCIIMask<sizeof(uintptr_t)>::value()) goto useLookupTable; diff --git a/WebCore/platform/text/qt/TextCodecQt.cpp b/WebCore/platform/text/qt/TextCodecQt.cpp index 735d773..94a2b7b 100644 --- a/WebCore/platform/text/qt/TextCodecQt.cpp +++ b/WebCore/platform/text/qt/TextCodecQt.cpp @@ -110,7 +110,7 @@ String TextCodecQt::decode(const char* bytes, size_t length, bool flush, bool /* int size = end - buf; size = qMin(size, MaxInputChunkSize); QString decoded = m_codec->toUnicode(buf, size, &m_state); - unicode.append(decoded); + unicode.append(reinterpret_cast_ptr<const UChar*>(decoded.unicode()), decoded.length()); buf += size; } |