projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The selection and drag operation works fine now.
[synfig.git]
/
ETL
/
trunk
/
test
/
pen.cpp
diff --git
a/ETL/trunk/test/pen.cpp
b/ETL/trunk/test/pen.cpp
index
8b1a555
..
ef6eaee
100644
(file)
--- a/
ETL/trunk/test/pen.cpp
+++ b/
ETL/trunk/test/pen.cpp
@@
-1,7
+1,7
@@
/*! ========================================================================
** Extended Template and Library Test Suite
** Handle Template Class Test
/*! ========================================================================
** Extended Template and Library Test Suite
** Handle Template Class Test
-** $Id
: pen.cpp,v 1.1.1.1 2005/01/04 01:31:48 darco Exp
$
+** $Id$
**
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
**
**
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
**
@@
-38,8
+38,6
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-#define DEBUGPOINT() fprintf(stderr,__FILE__":%d: Debugpoint\n",__LINE__)
-
/* === C L A S S E S ======================================================= */
int generic_pen_test(int w, int h)
/* === C L A S S E S ======================================================= */
int generic_pen_test(int w, int h)
@@
-88,31
+86,31
@@
int generic_pen_test(int w, int h)
if(diff.x!=w || diff.y!=h)
{
if(diff.x!=w || diff.y!=h)
{
- printf("FAILURE! "__FILE__"@%d: pen difference inconsist
a
ncy ([%d,%d]!=[%d,%d])\n",__LINE__,diff.x,diff.y,w,h);
+ printf("FAILURE! "__FILE__"@%d: pen difference inconsist
e
ncy ([%d,%d]!=[%d,%d])\n",__LINE__,diff.x,diff.y,w,h);
return 1;
}
if(pen.end_x()-pen.x()!=w-1)
{
return 1;
}
if(pen.end_x()-pen.x()!=w-1)
{
- printf("FAILURE! "__FILE__"@%d: iterator_x inconsist
ancy (%
d!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
+ printf("FAILURE! "__FILE__"@%d: iterator_x inconsist
ency (%l
d!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
return 1;
}
if(pen.end_y()-pen.y()!=h-1)
{
return 1;
}
if(pen.end_y()-pen.y()!=h-1)
{
- printf("FAILURE! "__FILE__"@%d: iterator_y inconsist
a
ncy (%d!=%d)\n",__LINE__,pen.end_y()-pen.y(),h);
+ printf("FAILURE! "__FILE__"@%d: iterator_y inconsist
e
ncy (%d!=%d)\n",__LINE__,pen.end_y()-pen.y(),h);
return 1;
}
if(&pen.end_y()[-1]!=&pen.y()[(h-2)])
{
return 1;
}
if(&pen.end_y()[-1]!=&pen.y()[(h-2)])
{
- printf("FAILURE! "__FILE__"@%d: iterator_y inconsist
a
ncy\n",__LINE__);
+ printf("FAILURE! "__FILE__"@%d: iterator_y inconsist
e
ncy\n",__LINE__);
return 1;
}
if(&pen.end_x()[-1]!=&pen.x()[(w-2)])
{
return 1;
}
if(&pen.end_x()[-1]!=&pen.x()[(w-2)])
{
- printf("FAILURE! "__FILE__"@%d: iterator_x inconsist
a
ncy\n",__LINE__);
+ printf("FAILURE! "__FILE__"@%d: iterator_x inconsist
e
ncy\n",__LINE__);
return 1;
}
return 1;
}
@@
-241,7
+239,7
@@
int box_blur_test(void)
{
for(x=0;x<w;x++,pen.inc_x())
{
{
for(x=0;x<w;x++,pen.inc_x())
{
- if(
x-y<=1 && y-x<=1
|| y==h/2 || x==w/2)
+ if(
(x-y<=1 && y-x<=1)
|| y==h/2 || x==w/2)
pen.put_value(2);
else
pen.put_value(0);
pen.put_value(2);
else
pen.put_value(0);
@@
-307,7
+305,7
@@
int box_blur_test(void)
if(ix < 0) ix = 0;
if(ix >= w) ix = w-1;
if(ix < 0) ix = 0;
if(ix >= w) ix = w-1;
- if(
ix-iy<=1 && iy-ix<=1
|| iy==h/2 || ix==w/2)
+ if(
(ix-iy<=1 && iy-ix<=1)
|| iy==h/2 || ix==w/2)
f += 2;
}
}
f += 2;
}
}