diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-20 23:25:32 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-20 23:25:32 +0200 |
| commit | 4213fa8a986ccfdf03783638862a9aacf3ea8601 (patch) | |
| tree | e1d78e3dcc74ce6c2605ff31e035fb7e4ad36453 /anim-crop-tool | |
| parent | d22abc50862f7243228c93fd2fd3878b37821487 (diff) | |
rename macros
Diffstat (limited to 'anim-crop-tool')
| -rw-r--r-- | anim-crop-tool/atlas.cpp | 5 | ||||
| -rw-r--r-- | anim-crop-tool/main.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/anim-crop-tool/atlas.cpp b/anim-crop-tool/atlas.cpp index a48ad359..b099435b 100644 --- a/anim-crop-tool/atlas.cpp +++ b/anim-crop-tool/atlas.cpp @@ -12,7 +12,7 @@ void anim_atlas_row::add_entry(const anim_atlas_entry& x) frame.offset = {xpos, ypos}; frame.size = {mat.cols, mat.rows}; - ASSERT(mat.rows > 0 && mat.cols > 0); + fm_assert(mat.rows > 0 && mat.cols > 0); data.push_back(x); xpos += mat.cols; max_height = std::max(mat.rows, max_height); @@ -23,7 +23,8 @@ void anim_atlas::advance_row() auto& row = rows.back(); if (row.data.empty()) return; - ASSERT(row.xpos > 0); ASSERT(row.max_height > 0); + fm_assert(row.xpos > 0); + fm_assert(row.max_height > 0); ypos += row.max_height; maxx = std::max(row.xpos, maxx); rows.push_back({{}, 0, 0, ypos}); diff --git a/anim-crop-tool/main.cpp b/anim-crop-tool/main.cpp index 11b1d165..126c3aa3 100644 --- a/anim-crop-tool/main.cpp +++ b/anim-crop-tool/main.cpp @@ -89,12 +89,12 @@ static bool load_file(anim_group& group, options& opts, anim_atlas& atlas, const if (opts.scale == 0.0) { - ASSERT(opts.width || opts.height); + fm_assert(opts.width || opts.height); if (opts.width) opts.scale = (double)opts.width / size.width; else opts.scale = (double)opts.height / size.height; - ASSERT(opts.scale > 1e-6); + fm_assert(opts.scale > 1e-6); } const cv::Size dest_size = { |
