diff --git a/uppsrc/Painter/Painter.hpp b/uppsrc/Painter/Painter.hpp index e12e55dfc..34549c634 100644 --- a/uppsrc/Painter/Painter.hpp +++ b/uppsrc/Painter/Painter.hpp @@ -158,7 +158,14 @@ inline Painter& Painter::EvenOdd(bool evenodd) inline Painter& Painter::Dash(const Vector& dash, double start) { - DashOp(dash, start); + if(dash.GetCount() & 1) { + Vector dash1; + dash1.Append(dash); + dash1.Append(dash); + DashOp(dash1, start); + } + else + DashOp(dash, start); return *this; } diff --git a/uppsrc/Painter/RadialGradient.cpp b/uppsrc/Painter/RadialGradient.cpp index 04dc3936b..e3abaa4da 100644 --- a/uppsrc/Painter/RadialGradient.cpp +++ b/uppsrc/Painter/RadialGradient.cpp @@ -167,10 +167,9 @@ struct UppRadialSpan { interpolator.coordinates(&x, &y); int h; if(focus) { - x >>= 8; - y >>= 8; - double dx = x - cx - fx; - double dy = y - cy - fy; + const double q256 = 1 / 256.0; + double dx = q256 * x - cx - fx; + double dy = q256 * y - cy - fy; if(dx == 0 && dy == 0) h = 0; else { diff --git a/uppsrc/Painter/agg_rasterizer_scanline_aa.h b/uppsrc/Painter/agg_rasterizer_scanline_aa.h index 67a60749b..77f52f989 100644 --- a/uppsrc/Painter/agg_rasterizer_scanline_aa.h +++ b/uppsrc/Painter/agg_rasterizer_scanline_aa.h @@ -378,6 +378,7 @@ namespace agg template void rasterizer_scanline_aa::line_to(int x, int y) { + RTIMING("line_to"); m_clipper.line_to(m_outline, conv_type::downscale(x), conv_type::downscale(y)); @@ -399,6 +400,7 @@ namespace agg template void rasterizer_scanline_aa::line_to_d(double x, double y) { + RTIMING("line_to_d"); m_clipper.line_to(m_outline, conv_type::upscale(x), conv_type::upscale(y)); diff --git a/uppsrc/ToDo.txt b/uppsrc/ToDo.txt index d0a260b52..72fd80571 100644 --- a/uppsrc/ToDo.txt +++ b/uppsrc/ToDo.txt @@ -1,3 +1,21 @@ +TODO: + +Major issues + +09/01/23: + SqlExp - caching of prepared statements + Decimal class + Socket in the Core + TheIDE - colored prints + - macros + - improve THISBACKs + - improve virtuals + - svn sync in initial dialog + mutable lock! + + + +=================== mutable and ONCELOCK! Shell_NotifyIconA and NOTIFYICONDATAA. @@ -28,7 +46,6 @@ Linux: Core: Date format: http://www.ultimatepp.org/forum/index.php?t=pmsg_view&&id=1494 - Merssene twister for GUID CtrlLib/CtrlCore: Dialog icon only if really needed (?) diff --git a/uppsrc/done.txt b/uppsrc/done.txt index 4deb1d543..4d1921370 100644 --- a/uppsrc/done.txt +++ b/uppsrc/done.txt @@ -1,3 +1,5 @@ + Merssene twister for GUID + ============ valgrind support in TheIDE