From f20cc67676bf0122203da9638592785389ea5c8c Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 23 Dec 2021 11:29:58 +0900 Subject: [PATCH] Revert "common: introduce iterator" This reverts commit e947fef9a4170b601cb92b868ae71dfd675a9173. Bad... This patch was wrongly applied... Change-Id: I5af1b3755ff5a0b44028fc664d8fd8c80c3ed3cd --- inc/thorvg.h | 10 +--------- src/lib/meson.build | 1 - src/lib/tvgInitializer.cpp | 2 +- src/lib/tvgIterator.cpp | 41 ----------------------------------------- 4 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 src/lib/tvgIterator.cpp diff --git a/inc/thorvg.h b/inc/thorvg.h index 127663c..49e112d 100644 --- a/inc/thorvg.h +++ b/inc/thorvg.h @@ -1533,14 +1533,6 @@ public: _TVG_DECLARE_PRIVATE(Saver); }; - -class TVG_EXPORT Iteratorv final -{ -public: - static std::unique_ptr iterate(std::unique_ptr picture, int(*func)(const Paint* paint, const Paint* parent, bool hasChildren)) noexcept; -}; - - /** @}*/ } //namespace @@ -1549,4 +1541,4 @@ public: } #endif -#endif //_THORVG_H_ \ No newline at end of file +#endif //_THORVG_H_ diff --git a/src/lib/meson.build b/src/lib/meson.build index 2d747f7..9c31700 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -30,7 +30,6 @@ source_file = [ 'tvgFill.cpp', 'tvgGlCanvas.cpp', 'tvgInitializer.cpp', - 'tvgIterator.cpp', 'tvgLinearGradient.cpp', 'tvgLzw.cpp', 'tvgLoader.cpp', diff --git a/src/lib/tvgInitializer.cpp b/src/lib/tvgInitializer.cpp index f1b1885..83ec50b 100644 --- a/src/lib/tvgInitializer.cpp +++ b/src/lib/tvgInitializer.cpp @@ -149,4 +149,4 @@ Result Initializer::term(CanvasEngine engine) noexcept uint16_t THORVG_VERSION_NUMBER() { return _version; -} \ No newline at end of file +} diff --git a/src/lib/tvgIterator.cpp b/src/lib/tvgIterator.cpp deleted file mode 100644 index d0d4d1d..0000000 --- a/src/lib/tvgIterator.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2020-2021 Samsung Electronics Co., Ltd. All rights reserved. - - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "tvgCommon.h" - -/************************************************************************/ -/* Internal Class Implementation */ -/************************************************************************/ - - - - -/************************************************************************/ -/* External Class Implementation */ -/************************************************************************/ - -unique_ptr Iteratorv::iterate(unique_ptr root, int(*func)(const Paint* paint, const Paint* parent, bool hasChild)) noexcept -{ - //TODO: Preorder traversal - - return nullptr; -} \ No newline at end of file -- 2.7.4