head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.24 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.22 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.20 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.18 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.16 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.14 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.12 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.10 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.8 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.6 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.4 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.2 pkgsrc-2023Q2-base:1.1; locks; strict; comment @// @; 1.1 date 2023.05.21.06.27.31; author wiz; state Exp; branches; next ; commitid VwbEDnwuN1RhpNpE; desc @@ 1.1 log @easyrpg-player: adapt some code for fmtlib 10 XXX: more to do @ text @$NetBSD$ Adapt for fmtlib 10. --- src/cache.cpp.orig 2021-10-29 19:42:00.000000000 +0000 +++ src/cache.cpp @@@@ -263,9 +263,9 @@@@ namespace { if (!is) { if (s.warn_missing) { - Output::Warning("Image not found: {}/{}", s.directory, filename); + Output::Warning("Image not found: {}/{}", std::string(s.directory), std::string(filename)); } else { - Output::Debug("Image not found: {}/{}", s.directory, filename); + Output::Debug("Image not found: {}/{}", std::string(s.directory), std::string(filename)); bmp = CreateEmpty(); } } else { @@@@ -274,7 +274,7 @@@@ namespace { T == Material::System ? Bitmap::Flag_System : 0); bmp = Bitmap::Create(std::move(is), transparent, flags); if (!bmp) { - Output::Warning("Invalid image: {}/{}", s.directory, filename); + Output::Warning("Invalid image: {}/{}", std::string(s.directory), std::string(filename)); } } } @@@@ -307,7 +307,7 @@@@ namespace { if (w < min_w || max_w < w || h < min_h || max_h < h) { Output::Debug("Image size out of bounds: {}/{} ({}x{} < {}x{} < {}x{})", - s.directory, filename, min_w, min_h, w, h, max_w, max_h); + std::string(s.directory), std::string(filename), min_w, min_h, w, h, max_w, max_h); } } @@@@ -357,7 +357,7 @@@@ BitmapRef Cache::Faceset(StringView file } BitmapRef Cache::Frame(StringView file, bool transparent) { - return LoadBitmap(file, transparent); + return LoadBitmap(std::string(file), transparent); } BitmapRef Cache::Gameover(StringView file) { @