Revision: 6342
http://playerstage.svn.sourceforge.net/playerstage/?rev=6342&view=rev
Author: gerkey
Date: 2008-04-16 12:40:29 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
fixed minor bugs
Modified Paths:
--------------
code/player/trunk/server/drivers/map/mapscale.cc
code/player/trunk/server/drivers/map/maptransform.cc
Modified: code/player/trunk/server/drivers/map/mapscale.cc
===================================================================
--- code/player/trunk/server/drivers/map/mapscale.cc 2008-04-16 19:40:05 UTC
(rev 6341)
+++ code/player/trunk/server/drivers/map/mapscale.cc 2008-04-16 19:40:29 UTC
(rev 6342)
@@ -187,13 +187,14 @@
scale_factor = this->source_map.scale / this->new_map.scale;
this->new_map.width = static_cast<unsigned int> (rint(this->source_map.width
* scale_factor));
this->new_map.height = static_cast<unsigned int>
(rint(this->source_map.height * scale_factor));
+ this->new_map.origin = this->source_map.origin;
PLAYER_MSG3(4,"MapScale: New map is %dx%d scale
%f",new_map.width,new_map.height,new_map.scale);
new_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
- this->new_map.width,
- this->new_map.height,
- GDK_INTERP_HYPER);
+ this->new_map.width,
+ this->new_map.height,
+ GDK_INTERP_HYPER);
g_assert(new_pixbuf);
new_map_pixels = gdk_pixbuf_get_pixels(new_pixbuf);
Modified: code/player/trunk/server/drivers/map/maptransform.cc
===================================================================
--- code/player/trunk/server/drivers/map/maptransform.cc 2008-04-16
19:40:05 UTC (rev 6341)
+++ code/player/trunk/server/drivers/map/maptransform.cc 2008-04-16
19:40:29 UTC (rev 6342)
@@ -199,7 +199,8 @@
PLAYER_MSG0(9,"ProcessMessage called for MapTransform Driver");
assert(hdr);
- assert(data);
+ // assert fails on empty messages
+ //assert(data);
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_MAP_REQ_GET_INFO,
device_addr))
{
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
