diff options
Diffstat (limited to 'libraries/daguerre')
| -rw-r--r-- | libraries/daguerre/include/daguerre/impl/fixed-font.hpp | 4 | ||||
| -rw-r--r-- | libraries/daguerre/include/daguerre/impl/image.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/daguerre/include/daguerre/impl/fixed-font.hpp b/libraries/daguerre/include/daguerre/impl/fixed-font.hpp index dbff798..1a5f3d8 100644 --- a/libraries/daguerre/include/daguerre/impl/fixed-font.hpp +++ b/libraries/daguerre/include/daguerre/impl/fixed-font.hpp @@ -20,7 +20,7 @@ namespace daguerre { template <class color_t> fixed_font<color_t>::fixed_font(fixed_font<color_t> &&other) : glyph_width(other.glyph_width), glyph_height(other.glyph_height) { - for (int i = 0; 0 < 128; ++i) + for (int i = 0; i < 128; ++i) glyphs[i] = std::move(other.glyphs[i]); other.glyph_width = 0; other.glyph_height = 0; @@ -31,7 +31,7 @@ namespace daguerre { fixed_font<color_t> &&other) { glyph_width = other.glyph_width; glyph_height = other.glyph_height; - for (int i = 0; 0 < 128; ++i) + for (int i = 0; i < 128; ++i) glyphs[i] = std::move(other.glyphs[i]); other.glyph_width = 0; other.glyph_height = 0; diff --git a/libraries/daguerre/include/daguerre/impl/image.hpp b/libraries/daguerre/include/daguerre/impl/image.hpp index 1264879..9160951 100644 --- a/libraries/daguerre/include/daguerre/impl/image.hpp +++ b/libraries/daguerre/include/daguerre/impl/image.hpp @@ -185,7 +185,7 @@ namespace daguerre { const param_t ¶m, const image<other_color_t> &other, int to_x, int to_y, param_converter_t<color_t, other_color_t, param_t> *conversion) { convert_from( - param, other, to_x, to_y, 0, 0, other.width, other.y, conversion); + param, other, to_x, to_y, 0, 0, other.width, other.height, conversion); } template <class color_t> |