fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve rebase conflict, fix compile errors

Browse Source
This commit is contained in:
Horror Proton
2023-02-17 19:54:14 +08:00
parent b4f3183487
commit 3f6a17d7ea
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
View File

@@ -2,7 +2,7 @@
#include "Utils/NoWarningCV.h"
#include "Controller.h"
#include "Controller/Controller.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"

2
src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.cpp
View File

@@ -3,7 +3,7 @@
#include <regex>
#include "Controller.h"
#include "Controller/Controller.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"

2
src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp
View File

@@ -1,7 +1,7 @@
#include "ReclamationControlTask.h"
#include "Config/Miscellaneous/BattleDataConfig.h"
#include "Controller.h"
#include "Controller/Controller.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
#include "Vision/OcrImageAnalyzer.h"

9
src/MaaCore/Utils/ImageIo.hpp
View File

@@ -1,3 +1,4 @@
#pragma once
#include <filesystem>
#include <fstream>
#include <string>
@@ -35,11 +36,11 @@ namespace asst
absolute_path = path;
}
std::filesystem::create_directories(absolute_path.parent_path());
std::basic_ofstream<uint8_t> of(absolute_path, std::ios::out | std::ios::binary);
std::ofstream of(absolute_path, std::ios::out | std::ios::binary);
std::vector<uint8_t> encoded;
auto ext = asst::utils::path_to_utf8_string(absolute_path.extension());
if (cv::imencode(ext.c_str(), img, encoded, params)) {
of.write(encoded.data(), encoded.size());
if (cv::imencode(ext, img, encoded, params)) {
of.write(reinterpret_cast<char*>(encoded.data()), encoded.size());
return true;
}
return false;
@@ -50,4 +51,4 @@ namespace asst
{
return imwrite(asst::utils::path(utf8_path), img, params);
}
}
} // namespace asst