development/ImHex
development/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex synced 2024-10-22 02:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys: Updated curl, libfmt, nativefiledialog and yara to latest version

Browse source
This commit is contained in:
WerWolv 2021-07-28 13:23:50 +02:00
parent 07ad9ed772
commit 330b4504dc
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/curl vendored

@ -1 +1 @@
Subproject commit 566b74a0e19b9aa610f4931e5bfd339bcf8e9147
Subproject commit bfbde883af33397943df68a3ae01847a634d33bf

2
external/fmt vendored

@ -1 +1 @@
Subproject commit 6271406233585a9178592b0492b190786bf0ee98
Subproject commit d141cdbeb0fb422a3fb7173b285fd38e0d1772dc

2
external/nativefiledialog vendored

@ -1 +1 @@
Subproject commit 300203a98d05477edd7b66ed54297f44eba202b1
Subproject commit 322d1bc2a98c7b8236195d458643ac8e76391011

2
external/yara/yara vendored

@ -1 +1 @@
Subproject commit 184227111979c5b6d37b0a23a984bc68bfc6cb45
Subproject commit 8206dc6f728fe50e21af92cb40e454b68ef6af05

6
plugins/builtin/source/content/tools_entries.cpp
View file

@ -391,11 +391,11 @@ namespace hex::plugin::builtin {
static const auto WarningColor = ImColor(0.92F, 0.25F, 0.2F, 1.0F);
if (setuid && !x[0])
ImGui::TextColored(WarningColor, "hex.builtin.tools.permissions.setuid_error"_lang);
ImGui::TextColored(WarningColor, "%s", static_cast<const char*>("hex.builtin.tools.permissions.setuid_error"_lang));
if (setgid && !x[1])
ImGui::TextColored(WarningColor, "hex.builtin.tools.permissions.setgid_error"_lang);
ImGui::TextColored(WarningColor, "%s", static_cast<const char*>("hex.builtin.tools.permissions.setgid_error"_lang));
if (sticky && !x[2])
ImGui::TextColored(WarningColor, "hex.builtin.tools.permissions.sticky_error"_lang);
ImGui::TextColored(WarningColor, "%s", static_cast<const char*>("hex.builtin.tools.permissions.sticky_error"_lang));
}

10
plugins/libimhex/include/hex/helpers/logger.hpp
View file

@ -8,32 +8,32 @@ namespace hex::log {
void debug(std::string_view fmt, auto ... args) {
#if defined(DEBUG)
fmt::print(fg(fmt::color::green_yellow) | fmt::emphasis::bold, "[DEBUG] ");
fmt::print(fmt, args...);
fmt::print(fmt::runtime(fmt), args...);
fmt::print("\n");
#endif
}
void info(std::string_view fmt, auto ... args) {
fmt::print(fg(fmt::color::cadet_blue) | fmt::emphasis::bold, "[INFO] ");
fmt::print(fmt, args...);
fmt::print(fmt::runtime(fmt), args...);
fmt::print("\n");
}
void warn(std::string_view fmt, auto ... args) {
fmt::print(fg(fmt::color::light_golden_rod_yellow) | fmt::emphasis::bold, "[WARN] ");
fmt::print(fmt, args...);
fmt::print(fmt::runtime(fmt), args...);
fmt::print("\n");
}
void error(std::string_view fmt, auto ... args) {
fmt::print(fg(fmt::color::red) | fmt::emphasis::bold, "[ERROR] ");
fmt::print(fmt, args...);
fmt::print(fmt::runtime(fmt), args...);
fmt::print("\n");
}
void fatal(std::string_view fmt, auto ... args) {
fmt::print(fg(fmt::color::purple) | fmt::emphasis::bold, "[FATAL] ");
fmt::print(fmt, args...);
fmt::print(fmt::runtime(fmt), args...);
fmt::print("\n");
}

4
plugins/libimhex/include/hex/helpers/utils.hpp
View file

@ -185,12 +185,12 @@ namespace hex {
template<typename ... Args>
inline std::string format(std::string_view format, Args ... args) {
return fmt::format(format, args...);
return fmt::format(fmt::runtime(format), args...);
}
template<typename ... Args>
inline void print(std::string_view format, Args ... args) {
fmt::print(format, args...);
fmt::print(fmt::runtime(format), args...);
}
[[nodiscard]] constexpr inline u64 extract(u8 from, u8 to, const hex::unsigned_integral auto &value) {