From 26fd6b5dfdf1ab475fdb240aafc446e16c83945e Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 14 Jun 2021 14:32:05 +0900 Subject: [PATCH] tvg_loader: code refactoring. renamed internal functions, no logical changes. --- src/loaders/tvg/tvgTvgLoadParser.cpp | 4 ++-- src/loaders/tvg/tvgTvgLoadParser.h | 4 ++-- src/loaders/tvg/tvgTvgLoader.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/loaders/tvg/tvgTvgLoadParser.cpp b/src/loaders/tvg/tvgTvgLoadParser.cpp index 87695e1a..f8e9af76 100644 --- a/src/loaders/tvg/tvgTvgLoadParser.cpp +++ b/src/loaders/tvg/tvgTvgLoadParser.cpp @@ -504,14 +504,14 @@ static LoaderResult _parsePaint(tvgBlock base_block, Paint **paint) /* External Class Implementation */ /************************************************************************/ -bool tvgValidateTvgHeader(const char *ptr, uint32_t size) +bool tvgValidateData(const char *ptr, uint32_t size) { auto end = ptr + size; if (!_readTvgHeader(&ptr) || ptr >= end) return false; return true; } -unique_ptr tvgLoadTvgData(const char *ptr, uint32_t size) +unique_ptr tvgLoadData(const char *ptr, uint32_t size) { auto end = ptr + size; diff --git a/src/loaders/tvg/tvgTvgLoadParser.h b/src/loaders/tvg/tvgTvgLoadParser.h index 915d3088..cadd45ed 100644 --- a/src/loaders/tvg/tvgTvgLoadParser.h +++ b/src/loaders/tvg/tvgTvgLoadParser.h @@ -26,7 +26,7 @@ #include "tvgCommon.h" #include "tvgBinaryDesc.h" -bool tvgValidateTvgHeader(const char *ptr, uint32_t size); -unique_ptr tvgLoadTvgData(const char *ptr, uint32_t size); +bool tvgValidateData(const char *ptr, uint32_t size); +unique_ptr tvgLoadData(const char *ptr, uint32_t size); #endif //_TVG_TVG_LOAD_PARSER_H_ diff --git a/src/loaders/tvg/tvgTvgLoader.cpp b/src/loaders/tvg/tvgTvgLoader.cpp index 6fc21d60..be3bfc4d 100644 --- a/src/loaders/tvg/tvgTvgLoader.cpp +++ b/src/loaders/tvg/tvgTvgLoader.cpp @@ -79,7 +79,7 @@ bool TvgLoader::open(const string &path) pointer = buffer; - return tvgValidateTvgHeader(pointer, size); + return tvgValidateData(pointer, size); } bool TvgLoader::open(const char *data, uint32_t size) @@ -89,7 +89,7 @@ bool TvgLoader::open(const char *data, uint32_t size) this->pointer = data; this->size = size; - return tvgValidateTvgHeader(pointer, size); + return tvgValidateData(pointer, size); } bool TvgLoader::read() @@ -111,7 +111,7 @@ bool TvgLoader::close() void TvgLoader::run(unsigned tid) { if (root) root.reset(); - root = tvgLoadTvgData(pointer, size); + root = tvgLoadData(pointer, size); if (!root) clearBuffer(); }