Revision: 6392
http://playerstage.svn.sourceforge.net/playerstage/?rev=6392&view=rev
Author: gerkey
Date: 2008-05-01 17:17:20 -0700 (Thu, 01 May 2008)
Log Message:
-----------
updated test
Modified Paths:
--------------
code/player/trunk/server/drivers/planner/wavefront/Makefile.test
code/player/trunk/server/drivers/planner/wavefront/plan.c
code/player/trunk/server/drivers/planner/wavefront/test.c
Modified: code/player/trunk/server/drivers/planner/wavefront/Makefile.test
===================================================================
--- code/player/trunk/server/drivers/planner/wavefront/Makefile.test
2008-04-29 18:58:10 UTC (rev 6391)
+++ code/player/trunk/server/drivers/planner/wavefront/Makefile.test
2008-05-02 00:17:20 UTC (rev 6392)
@@ -1,6 +1,6 @@
#CFLAGS = -I. -I../../../.. -Wall -Werror -O3 `pkg-config --cflags
gdk-pixbuf-2.0`
CFLAGS = -I. -I../../../.. -Wall -Werror -g `pkg-config --cflags
gdk-pixbuf-2.0`
-LIBS = -L../../../../libplayercore/.libs -lplayererror `pkg-config --libs
gdk-pixbuf-2.0`
+LIBS = -L../../../../build/libplayercore -lplayererror `pkg-config --libs
gdk-pixbuf-2.0`
SRCS = test.c plan.c plan_plan.c plan_waypoint.c heap.c plan_control.c
Modified: code/player/trunk/server/drivers/planner/wavefront/plan.c
===================================================================
--- code/player/trunk/server/drivers/planner/wavefront/plan.c 2008-04-29
18:58:10 UTC (rev 6391)
+++ code/player/trunk/server/drivers/planner/wavefront/plan.c 2008-05-02
00:17:20 UTC (rev 6392)
@@ -6,7 +6,7 @@
* CVS: $Id$
**************************************************************************/
-#include <config.h>
+//#include <config.h>
// This header MUST come before <openssl/md5.h>
#include <sys/types.h>
Modified: code/player/trunk/server/drivers/planner/wavefront/test.c
===================================================================
--- code/player/trunk/server/drivers/planner/wavefront/test.c 2008-04-29
18:58:10 UTC (rev 6391)
+++ code/player/trunk/server/drivers/planner/wavefront/test.c 2008-05-02
00:17:20 UTC (rev 6392)
@@ -59,7 +59,7 @@
assert((plan = plan_alloc(robot_radius+safety_dist,
robot_radius+safety_dist,
max_radius,
- dist_penalty)));
+ dist_penalty,0.5)));
// allocate space for map cells
assert(plan->cells == NULL);
@@ -187,8 +187,8 @@
rowstride = gdk_pixbuf_get_rowstride(pixbuf);
bps = gdk_pixbuf_get_bits_per_sample(pixbuf)/8;
n_channels = gdk_pixbuf_get_n_channels(pixbuf);
- if(gdk_pixbuf_get_has_alpha(pixbuf))
- n_channels++;
+ //if(gdk_pixbuf_get_has_alpha(pixbuf))
+ //n_channels++;
// Read data
pixels = gdk_pixbuf_get_pixels(pixbuf);
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 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
