diff --git a/source/gui/widgets/treebox.cpp b/source/gui/widgets/treebox.cpp index 0a114471..318d54dc 100644 --- a/source/gui/widgets/treebox.cpp +++ b/source/gui/widgets/treebox.cpp @@ -1736,11 +1736,11 @@ namespace nana //class trigger //struct treebox_node_type trigger::treebox_node_type::treebox_node_type() - :expanded(false), checked(checkstate::unchecked), hidden(false) + :expanded(false), hidden(false), checked(checkstate::unchecked) {} trigger::treebox_node_type::treebox_node_type(std::string text) - :text(std::move(text)), expanded(false), checked(checkstate::unchecked), hidden(false) + :text(std::move(text)), expanded(false), hidden(false), checked(checkstate::unchecked) {} trigger::treebox_node_type& trigger::treebox_node_type::operator=(const treebox_node_type& rhs) diff --git a/source/paint/detail/image_bmp.hpp b/source/paint/detail/image_bmp.hpp index b38cec7c..0e427285 100644 --- a/source/paint/detail/image_bmp.hpp +++ b/source/paint/detail/image_bmp.hpp @@ -14,6 +14,7 @@ #define NANA_PAINT_DETAIL_IMAGE_BMP_HPP #include +#include #include "image_pixbuf.hpp" namespace nana{ namespace paint @@ -132,7 +133,7 @@ namespace nana{ namespace paint return false; } private: - std::unique_ptr _m_decompress_rle8(const bitmap_info_header* header, const unsigned char* data, std::size_t data_size, std::size_t line_bytes) + std::unique_ptr _m_decompress_rle8(const bitmap_info_header* header, const unsigned char* data, std::size_t data_size) { std::size_t const lines = std::abs(header->biHeight); unsigned char* const indexes = new unsigned char[header->biWidth * lines]; @@ -222,7 +223,7 @@ namespace nana{ namespace paint if (1 == header->biCompression) { - indexes = _m_decompress_rle8(header, bits, length, line_bytes); + indexes = _m_decompress_rle8(header, bits, length); line_bytes = header->biWidth; bits = indexes.get(); }