diff --git a/include/nana/gui/widgets/slider.hpp b/include/nana/gui/widgets/slider.hpp index fb15bc34..9adb512c 100644 --- a/include/nana/gui/widgets/slider.hpp +++ b/include/nana/gui/widgets/slider.hpp @@ -38,12 +38,12 @@ namespace nana : public widget_geometrics { /// Colors - color_proxy color_adorn{ static_cast(0x3da3ce) }; - color_proxy color_bar{ static_cast(0x878787) }; - color_proxy color_slider{ static_cast(0x606060) }; + color_proxy color_adorn { static_cast(0x3da3ce) }; + color_proxy color_bar { static_cast(0x878787) }; + color_proxy color_slider { static_cast(0x606060) }; color_proxy color_slider_highlighted{ static_cast(0x2d93be) }; - color_proxy color_vernier{ colors::red }; - color_proxy color_vernier_text{ colors::white }; + color_proxy color_vernier { colors::red }; + color_proxy color_vernier_text { colors::white }; /// Geometrical parameters unsigned vernier_text_margin{ 8 }; diff --git a/source/paint/pixel_buffer.cpp b/source/paint/pixel_buffer.cpp index f2b438a1..23a8b4e5 100644 --- a/source/paint/pixel_buffer.cpp +++ b/source/paint/pixel_buffer.cpp @@ -1,7 +1,7 @@ /* * Pixel Buffer Implementation * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) + * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at @@ -1252,9 +1252,6 @@ namespace nana{ namespace paint const int right_point = static_cast(dest.x) + static_cast(size_rotated.width); - const int source_right = static_cast(sp->pixel_size.width); - const int source_bottom = static_cast(sp->pixel_size.height); - for (point point_dest{ static_cast(dest.x), static_cast(dest.y) }; point_dest.x < right_point; ++point_dest.x) { auto point_source = point_rotate.to(point_dest) + origin;