resolve some unpexpected code involving while upstream code sync.

Change-Id: Ie818f1db73e997bf6d7eaae24cf55303c55eceba

diff --git a/meson.build b/meson.build
index b337bafdd36090da695e050695602976b89c0db3..98d5a0d1a20c7da8ee1f59388e02d897b6505e80 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('thorvg',
         'cpp',
-        default_options : ['buildtype=debug', 'werror=false', 'optimization=0'],
+        default_options : ['buildtype=debugoptimized', 'werror=false', 'optimization=s'],
         version : '0.1.0',
         license : 'MIT')
 

diff --git a/packaging/thorvg.spec b/packaging/thorvg.spec
index d3e1083bb7d24fe0803dd7fd602a75b343cf8a2e..60a01259a1b59105dba4f13c1343265fd8d425b4 100644 (file)
--- a/packaging/thorvg.spec
+++ b/packaging/thorvg.spec
@@ -1,6 +1,6 @@
 Name:       thorvg
 Summary:    Thor Vector Graphics Library
-Version:    0.1.2
+Version:    0.1.1
 Release:    1
 Group:      Graphics System/Rendering Engine
 License:    MIT

diff --git a/src/lib/tvgCanvas.cpp b/src/lib/tvgCanvas.cpp
index a74580d079ae74480167d0a25984b2aeba1b7487..f886c74ec9b1c91e1796dfad3eb84412857bd0ca 100644 (file)
--- a/src/lib/tvgCanvas.cpp
+++ b/src/lib/tvgCanvas.cpp
@@ -45,7 +45,6 @@ Result Canvas::reserve(uint32_t n) noexcept
 
 Result Canvas::push(unique_ptr<Paint> paint) noexcept
 {
-       return Result::Success;
     return pImpl->push(move(paint));
 }
 
@@ -62,8 +61,6 @@ Result Canvas::draw() noexcept
 {
 dlog_print(DLOG_ERROR, LOG_TAG, "Canvas(%p) Draw", this);
 
-       return Result::Success;
-
     return pImpl->draw();
 }
 
@@ -72,8 +69,6 @@ Result Canvas::update(Paint* paint) noexcept
 {
 dlog_print(DLOG_ERROR, LOG_TAG, "Canvas(%p) Update", this);
 
-       return Result::Success;
-
     return pImpl->update(paint, false);
 }
 
@@ -82,8 +77,6 @@ Result Canvas::sync() noexcept
 {
 dlog_print(DLOG_ERROR, LOG_TAG, "Canvas(%p) Sync", this);
 
-       return Result::Success;
-
     if (pImpl->renderer->sync()) return Result::Success;
 
     return Result::InsufficientCondition;

diff --git a/src/lib/tvgPicture.cpp b/src/lib/tvgPicture.cpp
index 637b19e12ba5b4309e2037b46c2041ff4c3933ee..ddbd3c061cdcd662a54d472777851d2826498750 100644 (file)
--- a/src/lib/tvgPicture.cpp
+++ b/src/lib/tvgPicture.cpp
@@ -47,7 +47,6 @@ unique_ptr<Picture> Picture::gen() noexcept
 
 Result Picture::load(const std::string& path) noexcept
 {
-    return Result::Success;
     if (path.empty()) return Result::InvalidArguments;
 
     return pImpl->load(path);
@@ -56,8 +55,6 @@ Result Picture::load(const std::string& path) noexcept
 
 Result Picture::load(const char* data, uint32_t size) noexcept
 {
-    return Result::Success;
-
     if (!data || size <= 0) return Result::InvalidArguments;
 
     return pImpl->load(data, size);
@@ -66,8 +63,6 @@ Result Picture::load(const char* data, uint32_t size) noexcept
 
 Result Picture::load(uint32_t* data, uint32_t w, uint32_t h, bool copy) noexcept
 {
-    return Result::Success;
-
     if (!data || w <= 0 || h <= 0) return Result::InvalidArguments;
 
     return pImpl->load(data, w, h, copy);

diff --git a/src/lib/tvgShapeImpl.h b/src/lib/tvgShapeImpl.h
index e36e96997b3a0070e744afc9b8bd7e862055fc1f..b978221a9516df7f31167778851d120992bf50ee 100644 (file)
--- a/src/lib/tvgShapeImpl.h
+++ b/src/lib/tvgShapeImpl.h
@@ -219,7 +219,6 @@ struct Shape::Impl
 
     bool dispose(RenderMethod& renderer)
     {
-        return true;
         auto ret = renderer.dispose(rdata);
         rdata = nullptr;
         return ret;
@@ -227,13 +226,11 @@ struct Shape::Impl
 
     bool render(RenderMethod& renderer)
     {
-        return true;
         return renderer.renderShape(rdata);
     }
 
     void* update(RenderMethod& renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag pFlag)
     {
-        return nullptr;
         this->rdata = renderer.prepare(*shape, this->rdata, transform, opacity, clips, static_cast<RenderUpdateFlag>(pFlag | flag));
         flag = RenderUpdateFlag::None;
         return this->rdata;