summaryrefslogtreecommitdiffhomepage
path: root/wall-tileset-tool
diff options
context:
space:
mode:
Diffstat (limited to 'wall-tileset-tool')
-rw-r--r--wall-tileset-tool/main.cpp8
-rw-r--r--wall-tileset-tool/main.hpp3
2 files changed, 9 insertions, 2 deletions
diff --git a/wall-tileset-tool/main.cpp b/wall-tileset-tool/main.cpp
index ac4a7498..4fc62b9d 100644
--- a/wall-tileset-tool/main.cpp
+++ b/wall-tileset-tool/main.cpp
@@ -2,7 +2,6 @@
#include "compat/assert.hpp"
#include "compat/sysexits.hpp"
#include "compat/fix-argv0.hpp"
-#include "compat/strerror.hpp"
//#include "compat/format.hpp"
#include "compat/debug.hpp"
#include "src/wall-atlas.hpp"
@@ -42,7 +41,7 @@ Vector2i get_buffer_size(const wall_atlas_def& a)
for (auto j = 0uz; j < (size_t)Group_::COUNT; j++)
{
const auto& group = (dir.*(Direction::groups[j].member));
- if (group.is_empty())
+ if (!group.is_defined)
continue;
auto val = wall_atlas::expected_size(a.header.depth, (Group_)j);
size = Math::max(size, val);
@@ -202,6 +201,11 @@ using namespace floormat::wall_tool;
int main(int argc, char** argv)
{
+ auto s = "foo"_s;
+ static_assert(std::is_same_v<decltype(quoted(StringView{"foo"}))::type, StringView>);
+ static_assert(std::is_same_v<decltype(quoted(String{"foo"}))::type, String>);
+ static_assert(std::is_same_v<decltype(quoted(s))::type, const StringView&>);
+
argv[0] = fix_argv0(argv[0]);
auto [opts, args, opts_ok] = parse_cmdline(argc, argv);
if (!opts_ok)
diff --git a/wall-tileset-tool/main.hpp b/wall-tileset-tool/main.hpp
index b826d634..d6403ccf 100644
--- a/wall-tileset-tool/main.hpp
+++ b/wall-tileset-tool/main.hpp
@@ -4,7 +4,10 @@
namespace cv {
template<typename T> class Mat_;
template<typename T, int cn> class Vec;
+typedef Vec<unsigned char, 3> Vec3b;
typedef Vec<unsigned char, 4> Vec4b;
+typedef Mat_<unsigned char> Mat1b;
+typedef Mat_<Vec3b> Mat3b;
typedef Mat_<Vec4b> Mat4b;
} // namespace cv