mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 03:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of git@github.com:dacap/aseprite.git into dev

Browse Source
This commit is contained in:
David Capello 2013-07-28 21:17:54 -03:00
commit 5bd57061c6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/context.h
View File

@ -88,9 +88,6 @@ private:
// List of all documents. // List of all documents.
Documents m_documents; Documents m_documents;
// Active/selected document to operate.
Document* m_activeDocument;
// Settings in this context. // Settings in this context.
ISettings* m_settings; ISettings* m_settings;

6
src/raster/pen.cpp
View File

@ -18,12 +18,12 @@
#include "config.h" #include "config.h"
#include <math.h>
#include "raster/algo.h" #include "raster/algo.h"
#include "raster/pen.h" #include "raster/pen.h"
#include "raster/image.h" #include "raster/image.h"
#include <cmath>
Pen::Pen() Pen::Pen()
{ {
m_type = PEN_TYPE_CIRCLE; m_type = PEN_TYPE_CIRCLE;
@ -101,7 +101,7 @@ void Pen::regenerate_pen()
int size = m_size; int size = m_size;
if (m_type == PEN_TYPE_SQUARE && m_angle != 0 && m_size > 2) 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); m_image = Image::create(IMAGE_BITMAP, size, size);