From 56433484726f7c1f165c35b27ac1625113234bc0 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 14 Dec 2023 14:53:13 +0900 Subject: [PATCH] common: clean up the code. --- src/loaders/external_jpg/tvgJpgLoader.h | 1 - src/loaders/external_png/tvgPngLoader.h | 1 - src/loaders/external_webp/tvgWebpLoader.h | 1 - src/loaders/jpg/tvgJpgLoader.h | 1 - src/loaders/lottie/tvgLottieLoader.h | 2 -- src/loaders/png/tvgPngLoader.h | 1 - src/loaders/svg/tvgSvgLoader.h | 1 - src/loaders/tvg/tvgTvgLoader.h | 1 - src/renderer/tvgPicture.cpp | 2 +- 9 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/loaders/external_jpg/tvgJpgLoader.h b/src/loaders/external_jpg/tvgJpgLoader.h index 75b784c6..5443b718 100644 --- a/src/loaders/external_jpg/tvgJpgLoader.h +++ b/src/loaders/external_jpg/tvgJpgLoader.h @@ -34,7 +34,6 @@ public: JpgLoader(); ~JpgLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/loaders/external_png/tvgPngLoader.h b/src/loaders/external_png/tvgPngLoader.h index 8fb09c06..d2c43728 100644 --- a/src/loaders/external_png/tvgPngLoader.h +++ b/src/loaders/external_png/tvgPngLoader.h @@ -32,7 +32,6 @@ public: PngLoader(); ~PngLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/loaders/external_webp/tvgWebpLoader.h b/src/loaders/external_webp/tvgWebpLoader.h index 1f9bfd76..e513c886 100644 --- a/src/loaders/external_webp/tvgWebpLoader.h +++ b/src/loaders/external_webp/tvgWebpLoader.h @@ -32,7 +32,6 @@ public: WebpLoader(); ~WebpLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/loaders/jpg/tvgJpgLoader.h b/src/loaders/jpg/tvgJpgLoader.h index 8a05a491..496b3645 100644 --- a/src/loaders/jpg/tvgJpgLoader.h +++ b/src/loaders/jpg/tvgJpgLoader.h @@ -42,7 +42,6 @@ public: JpgLoader(); ~JpgLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/loaders/lottie/tvgLottieLoader.h b/src/loaders/lottie/tvgLottieLoader.h index f8e77c13..4988608a 100644 --- a/src/loaders/lottie/tvgLottieLoader.h +++ b/src/loaders/lottie/tvgLottieLoader.h @@ -48,8 +48,6 @@ public: LottieLoader(); ~LottieLoader(); - //Lottie Loaders - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const std::string& rpath, bool copy) override; bool resize(Paint* paint, float w, float h) override; diff --git a/src/loaders/png/tvgPngLoader.h b/src/loaders/png/tvgPngLoader.h index a19aca6f..94bda8c5 100644 --- a/src/loaders/png/tvgPngLoader.h +++ b/src/loaders/png/tvgPngLoader.h @@ -42,7 +42,6 @@ public: PngLoader(); ~PngLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/loaders/svg/tvgSvgLoader.h b/src/loaders/svg/tvgSvgLoader.h index ba3e999c..e706efb2 100644 --- a/src/loaders/svg/tvgSvgLoader.h +++ b/src/loaders/svg/tvgSvgLoader.h @@ -42,7 +42,6 @@ public: SvgLoader(); ~SvgLoader(); - using LoadModule::open; bool open(const string& path) override; bool open(const char* data, uint32_t size, const string& rpath, bool copy) override; bool resize(Paint* paint, float w, float h) override; diff --git a/src/loaders/tvg/tvgTvgLoader.h b/src/loaders/tvg/tvgTvgLoader.h index f149dea4..492a3810 100644 --- a/src/loaders/tvg/tvgTvgLoader.h +++ b/src/loaders/tvg/tvgTvgLoader.h @@ -45,7 +45,6 @@ public: TvgLoader(); ~TvgLoader(); - using LoadModule::open; bool open(const string &path) override; bool open(const char *data, uint32_t size, const string& rpath, bool copy) override; bool read() override; diff --git a/src/renderer/tvgPicture.cpp b/src/renderer/tvgPicture.cpp index 1f2271a0..76bab6e6 100644 --- a/src/renderer/tvgPicture.cpp +++ b/src/renderer/tvgPicture.cpp @@ -42,7 +42,7 @@ RenderUpdateFlag Picture::Impl::load() } return RenderUpdateFlag::None; } - } else loader->sync(); + } if (!surface) { if ((surface = loader->bitmap().release())) {