Changeset 846 for trunk/src/3rdparty/harfbuzz/tests

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/harfbuzz/tests/fuzzing (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/harfbuzz/tests/fuzzing )
• src/3rdparty/harfbuzz/tests/fuzzing/fuzz.cc (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/3rdparty/harfbuzz/tests/fuzzing/fuzz.cc )
• src/3rdparty/harfbuzz/tests/linebreaking/harfbuzz-qt.cpp (modified) (1 diff)

trunk/src/3rdparty/harfbuzz/tests/linebreaking/harfbuzz-qt.cpp

@@ -80 +80 @@
 }
 
-void *HB_Library_Resolve(const char *library, const char *symbol)
+void *HB_Library_Resolve(const char *library, int version, const char *symbol)
 {
-    return QLibrary::resolve(library, symbol);
-}
-
-void *HB_TextCodecForMib(int mib)
-{
-    return QTextCodec::codecForMib(mib);
-}
-
-char *HB_TextCodec_ConvertFromUnicode(void *codec, const HB_UChar16 *unicode, hb_uint32 length, hb_uint32 *outputLength)
-{
-    QByteArray data = reinterpret_cast<QTextCodec *>(codec)->fromUnicode((const QChar *)unicode, length);
-    // ### suboptimal
-    char *output = (char *)malloc(data.length() + 1);
-    memcpy(output, data.constData(), data.length() + 1);
-    if (outputLength)
-        *outputLength = data.length();
-    return output;
-}
-
-void HB_TextCodec_FreeResult(char *string)
-{
-    free(string);
+    return QLibrary::resolve(library, version, symbol);
 }