From bf14deb999c6baa74b22523068911d8427eb0155 Mon Sep 17 00:00:00 2001 From: HanSY Date: Wed, 18 Dec 2024 15:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=A0=E5=8A=A0=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=BF=9D=E7=95=99=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: HanSY --- src/file_manager.cpp | 2 +- src/generic_compiler.cpp | 1 + src/reference_parser.cpp | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/file_manager.cpp b/src/file_manager.cpp index 1141c35..c508728 100644 --- a/src/file_manager.cpp +++ b/src/file_manager.cpp @@ -42,7 +42,7 @@ uint32_t FileManager::ScanModules(const vector &inputs, const string &ou if (!noBaseResource.empty()) { ResourceUtil::PrintWarningMsg(noBaseResource); } - return isHar || scanHap_ ? RESTOOL_SUCCESS : ParseReference(output); + return isHar ? RESTOOL_SUCCESS : ParseReference(output); } uint32_t FileManager::MergeResourceItem(const map> &resourceInfos) diff --git a/src/generic_compiler.cpp b/src/generic_compiler.cpp index 52056fa..9a40e4e 100644 --- a/src/generic_compiler.cpp +++ b/src/generic_compiler.cpp @@ -29,6 +29,7 @@ GenericCompiler::GenericCompiler(ResType type, const string &output, bool isOver : IResourceCompiler(type, output, isOverlap) { } + GenericCompiler::~GenericCompiler() { } diff --git a/src/reference_parser.cpp b/src/reference_parser.cpp index 2cb8ed2..407fc96 100644 --- a/src/reference_parser.cpp +++ b/src/reference_parser.cpp @@ -70,6 +70,9 @@ uint32_t ReferenceParser::ParseRefInResources(map> { for (auto &iter : items) { for (auto &resourceItem : iter.second) { + if (resourceItem.IsCoverable()) { + continue; + } if (IsElementRef(resourceItem) && ParseRefInResourceItem(resourceItem) != RESTOOL_SUCCESS) { return RESTOOL_ERROR; }