From 6f3ff2a3553695d613389f2cb7e98b218d2fe2f9 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 22 Oct 2021 23:21:26 +0900 Subject: [PATCH] wasm: update the code. Yes, now we have standard apis for getting class types, don't need to hack it anymore. Now, replaced the redundant id() calls with identifier() --- src/wasm/thorvgwasm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wasm/thorvgwasm.cpp b/src/wasm/thorvgwasm.cpp index b4cb0263..ba76449f 100644 --- a/src/wasm/thorvgwasm.cpp +++ b/src/wasm/thorvgwasm.cpp @@ -240,13 +240,13 @@ private: void sublayers(Array* layers, const Paint* paint, uint32_t depth) { //paint - if (paint->id() != TVG_CLASS_ID_SHAPE) { + if (paint->identifier() != Shape::identifier()) { auto it = this->iterator(paint); if (it->count() > 0) { layers->reserve(layers->count + it->count()); it->begin(); while (auto child = it->next()) { - uint32_t type = child->id(); + uint32_t type = child->identifier(); uint32_t opacity = child->opacity(); layers->push({.paint = reinterpret_cast(child), .depth = depth + 1, .type = type, .composite = static_cast(CompositeMethod::None), .opacity = opacity}); sublayers(layers, child, depth + 1); @@ -257,7 +257,7 @@ private: const Paint* compositeTarget = nullptr; CompositeMethod composite = paint->composite(&compositeTarget); if (compositeTarget && composite != CompositeMethod::None) { - uint32_t type = compositeTarget->id(); + uint32_t type = compositeTarget->identifier(); uint32_t opacity = compositeTarget->opacity(); layers->push({.paint = reinterpret_cast(compositeTarget), .depth = depth, .type = type, .composite = static_cast(composite), .opacity = opacity}); sublayers(layers, compositeTarget, depth); @@ -271,7 +271,7 @@ private: return parent; } //paint - if (parent->id() != TVG_CLASS_ID_SHAPE) { + if (parent->identifier() != Shape::identifier()) { auto it = this->iterator(parent); if (it->count() > 0) { it->begin();