aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCC warnings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-12-21 12:56:31 +02:00
parent f62b78bd9b
commit bd6cf95340
4 changed files with 665 additions and 652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/vobj/delaunay.c
View File

@ -107,16 +107,16 @@ struct delaunay_s
/*
* 3x3 matrix determinant
*/
static real det3( mat3_t *m )
{
real res;
//static real det3( mat3_t *m )
//{
// real res;
res = ((*m)[0][0]) * (((*m)[1][1]) * ((*m)[2][2]) - ((*m)[1][2]) * ((*m)[2][1]))
- ((*m)[0][1]) * (((*m)[1][0]) * ((*m)[2][2]) - ((*m)[1][2]) * ((*m)[2][0]))
+ ((*m)[0][2]) * (((*m)[1][0]) * ((*m)[2][1]) - ((*m)[1][1]) * ((*m)[2][0]));
// res = ((*m)[0][0]) * (((*m)[1][1]) * ((*m)[2][2]) - ((*m)[1][2]) * ((*m)[2][1]))
// - ((*m)[0][1]) * (((*m)[1][0]) * ((*m)[2][2]) - ((*m)[1][2]) * ((*m)[2][0]))
// + ((*m)[0][2]) * (((*m)[1][0]) * ((*m)[2][1]) - ((*m)[1][1]) * ((*m)[2][0]));
return res;
}
// return res;
//}
/*
* allocate a point
@ -274,12 +274,12 @@ static int del_classify_point( halfedge_t *d, point2d_t *pt )
/*
* return the absolute value
*/
static real dabs( real a )
{
if( a < REAL_ZERO )
return (-a);
return a;
}
//static real dabs( real a )
//{
// if( a < REAL_ZERO )
// return (-a);
// return a;
//}
/*
* compute the circle given 3 points
@ -998,7 +998,7 @@ void del_build_faces( delaunay_t *del )
/*
*/
delaunay2d_t* delaunay2d_from(del_point2d_t *points, unsigned int num_points, incircle_predicate_t pred) {
delaunay2d_t* delaunay2d_from(del_point2d_t *points, unsigned int num_points) {
delaunay2d_t* res = NULL;
delaunay_t del;
unsigned int i, j, fbuff_size = 0;

2
src/libs/vobj/delaunay.h
View File

@ -78,7 +78,7 @@ typedef int (*incircle_predicate_t)(del_point2d_t* p0, del_point2d_t* p1, del_p
* @pred: incircle predicate
* @return: the number of created faces
*/
delaunay2d_t* delaunay2d_from(del_point2d_t *points, unsigned int num_points, incircle_predicate_t pred);
delaunay2d_t* delaunay2d_from(del_point2d_t *points, unsigned int num_points);
/*
* release a delaunay2d object

15
src/libs/vobj/vobjengine.cpp
View File

@ -142,12 +142,12 @@ void VObjEngine::drawPath(const QPainterPath &path)
}
int offset = 0;
delaunay2d_t *res = delaunay2d_from(points, num_points, NULL);//Calculate faces
delaunay2d_t *res = delaunay2d_from(points, num_points);//Calculate faces
QPointF pf[MAX_POINTS];
bool skipFace=false;//Need skip first face
for(int i = 0; i < res->num_faces; i++ )
for(unsigned int i = 0; i < res->num_faces; i++ )
{
if (offset == 0)
{
@ -200,6 +200,11 @@ void VObjEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawM
*stream << endl;
}
void VObjEngine::drawPolygon(const QPoint *points, int pointCount, QPaintEngine::PolygonDrawMode mode)
{
QPaintEngine::drawPolygon(points, pointCount, mode);
}
//---------------------------------------------------------------------------------------------------------------------
QPaintEngine::Type VObjEngine::type() const
{
@ -220,6 +225,12 @@ void VObjEngine::drawPoints(const QPointF *points, int pointCount)
}
}
//---------------------------------------------------------------------------------------------------------------------
void VObjEngine::drawPoints(const QPoint *points, int pointCount)
{
QPaintEngine::drawPoints(points, pointCount);
}
//---------------------------------------------------------------------------------------------------------------------
void VObjEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
{

2
src/libs/vobj/vobjengine.h
View File

@ -48,8 +48,10 @@ public:
virtual void drawPath(const QPainterPath &path);
virtual Type type() const;
virtual void drawPoints(const QPointF *points, int pointCount);
virtual void drawPoints(const QPoint *points, int pointCount);
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
QSize getSize() const;
void setSize(const QSize &value);