diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2022-10-12 14:25:18 +0200 |
|---|---|---|
| committer | Morten Sørvig <morten.sorvig@qt.io> | 2022-12-28 17:57:48 +0200 |
| commit | b36e624c89c4920c48f4ca0a85390b8868149eee (patch) | |
| tree | 7c9e34302f41023729e880cf5206799d45a4f5c1 /src/plugins/platforms/wasm/qwasmfontdatabase.cpp | |
| parent | 3c24bb026e57fc988d31a5bd22f4059fb4cb6c79 (diff) | |
wasm: use public API for converting from Uint8Array
Use the new QByteAaray::fromUint8Array() function.
Change-Id: I7bb7a8184e1bfde2a89af2efb331db64f0b4d285
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmfontdatabase.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmfontdatabase.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp index 37f80279e0f..7b8265ca23c 100644 --- a/src/plugins/platforms/wasm/qwasmfontdatabase.cpp +++ b/src/plugins/platforms/wasm/qwasmfontdatabase.cpp @@ -12,21 +12,6 @@ #include <emscripten/val.h> #include <emscripten/bind.h> -// FIXME: replace with shared implementation from qstdweb -QByteArray fromUint8Array(emscripten::val uint8array) -{ - qstdweb::ArrayBuffer arrayBuffer(uint8array); - - using qstdweb::Uint8Array; - Uint8Array sourceArray(arrayBuffer); - if (sourceArray.length() > std::numeric_limits<qsizetype>::max()) - return QByteArray(); - QByteArray destinationArray; - destinationArray.resize(sourceArray.length()); - sourceArray.copyTo(destinationArray.data()); - return destinationArray; -} - QT_BEGIN_NAMESPACE using namespace emscripten; @@ -121,7 +106,7 @@ void QWasmFontDatabase::populateFamily(const QString &familyName) .thenFunc = [](val status) { qCDebug(lcQpaFonts) << "onArrayBuffer" ; - QByteArray fontByteArray = fromUint8Array(status); + QByteArray fontByteArray = QByteArray::fromUint8Array(status); QFreeTypeFontDatabase::addTTFile(fontByteArray, QByteArray()); |