git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-28 17:15:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wasm: code refactoring.

Browse source 
Use Picture::size() method instead of scale()

Picture newly supports size() method to resize image.
It's more convenient for users in its usage.
This commit is contained in:
Hermet Park 2020-12-07 16:57:28 +09:00 • committed by Hermet Park
parent 1e78d1f845
commit af88da976d
1 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/wasm/thorvgwasm.cpp
View file

@ -28,8 +28,6 @@ public:
bool load(string data, int width, int height) bool load(string data, int width, int height)
{ {
float w, h;
mErrorMsg = "None"; mErrorMsg = "None";
if (!mSwCanvas) { if (!mSwCanvas) {
@ -57,12 +55,6 @@ public:
return false; return false;
} }
/* get default size */
mPicture->viewbox(nullptr, nullptr, &w, &h);
mDefaultWidth = static_cast<uint32_t>(w);
mDefaultHeight = static_cast<uint32_t>(h);
updateScale();
updateSize(width, height); updateSize(width, height);
if (mSwCanvas->push(unique_ptr<Picture>(mPicture)) != Result::Success) { if (mSwCanvas->push(unique_ptr<Picture>(mPicture)) != Result::Success) {
@ -120,11 +112,6 @@ public:
return val(typed_memory_view(mWidth * mHeight * 4, mBuffer.get())); return val(typed_memory_view(mWidth * mHeight * 4, mBuffer.get()));
} }
float getScale()
{
return mScale;
}
private: private:
explicit ThorvgWasm() explicit ThorvgWasm()
{ {
@ -148,18 +135,7 @@ private:
mBuffer = make_unique<uint8_t[]>(mWidth * mHeight * 4); mBuffer = make_unique<uint8_t[]>(mWidth * mHeight * 4);
mSwCanvas->target((uint32_t *)mBuffer.get(), mWidth, mWidth, mHeight, SwCanvas::ABGR8888); mSwCanvas->target((uint32_t *)mBuffer.get(), mWidth, mWidth, mHeight, SwCanvas::ABGR8888);
updateScale(); if (mPicture) mPicture->size(width, height);
}
void updateScale()
{
if (!mPicture) return;
float scaleX = static_cast<float>(mWidth) / static_cast<float>(mDefaultWidth);
float scaleY = static_cast<float>(mHeight) / static_cast<float>(mDefaultHeight);
mScale = scaleX < scaleY ? scaleX : scaleY;
mPicture->scale(mScale);
} }
private: private:
@ -170,9 +146,6 @@ private:
uint32_t mWidth{0}; uint32_t mWidth{0};
uint32_t mHeight{0}; uint32_t mHeight{0};
uint32_t mDefaultWidth{0};
uint32_t mDefaultHeight{0};
float mScale{0};
}; };
// Binding code // Binding code
@ -183,6 +156,5 @@ EMSCRIPTEN_BINDINGS(thorvg_bindings) {
.function("getDefaultData", &ThorvgWasm::getDefaultData, allow_raw_pointers()) .function("getDefaultData", &ThorvgWasm::getDefaultData, allow_raw_pointers())
.function("load", &ThorvgWasm::load) .function("load", &ThorvgWasm::load)
.function("update", &ThorvgWasm::update) .function("update", &ThorvgWasm::update)
.function("render", &ThorvgWasm::render) .function("render", &ThorvgWasm::render);
.function("getScale", &ThorvgWasm::getScale);
} }