Revision: 2192
http://synfig.svn.sourceforge.net/synfig/?rev=2192&view=rev
Author: pabs3
Date: 2008-11-13 04:42:09 +0000 (Thu, 13 Nov 2008)
Log Message:
-----------
Silence a couple of g++ 4.4 warnings in ETL make check
Modified Paths:
--------------
ETL/trunk/test/pen.cpp
ETL/trunk/test/surface.cpp
Modified: ETL/trunk/test/pen.cpp
===================================================================
--- ETL/trunk/test/pen.cpp 2008-11-13 04:28:10 UTC (rev 2191)
+++ ETL/trunk/test/pen.cpp 2008-11-13 04:42:09 UTC (rev 2192)
@@ -92,7 +92,7 @@
if(pen.end_x()-pen.x()!=w-1)
{
- printf("FAILURE! "__FILE__"@%d: iterator_x inconsistency
(%d!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
+ printf("FAILURE! "__FILE__"@%d: iterator_x inconsistency
(%ld!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
return 1;
}
@@ -239,7 +239,7 @@
{
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);
@@ -305,7 +305,7 @@
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;
}
}
Modified: ETL/trunk/test/surface.cpp
===================================================================
--- ETL/trunk/test/surface.cpp 2008-11-13 04:28:10 UTC (rev 2191)
+++ ETL/trunk/test/surface.cpp 2008-11-13 04:42:09 UTC (rev 2192)
@@ -77,7 +77,7 @@
{
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);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
