From 11d148c5339977dde5721ce3d8341cd1ecc376cc Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 24 Jun 2013 17:33:48 -0300 Subject: [PATCH 1/2] Remove unused attribute Context::m_activeDocument --- src/context.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/context.h b/src/context.h index f9fea0666..148dc9506 100644 --- a/src/context.h +++ b/src/context.h @@ -88,9 +88,6 @@ private: // List of all documents. Documents m_documents; - // Active/selected document to operate. - Document* m_activeDocument; - // Settings in this context. ISettings* m_settings; From 406b4a1410d684110880b0ede61bdbfb0b19af4f Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 26 Jun 2013 13:08:17 -0300 Subject: [PATCH 2/2] Fix VS2005 compilation problem --- src/raster/pen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/raster/pen.cpp b/src/raster/pen.cpp index da4a8ffe6..f0be446da 100644 --- a/src/raster/pen.cpp +++ b/src/raster/pen.cpp @@ -18,12 +18,12 @@ #include "config.h" -#include - #include "raster/algo.h" #include "raster/pen.h" #include "raster/image.h" +#include + Pen::Pen() { m_type = PEN_TYPE_CIRCLE; @@ -101,7 +101,7 @@ void Pen::regenerate_pen() int size = m_size; if (m_type == PEN_TYPE_SQUARE && m_angle != 0 && m_size > 2) - size = std::sqrt(2*m_size*m_size)+2; + size = std::sqrt((double)2*m_size*m_size)+2; m_image = Image::create(IMAGE_BITMAP, size, size);