Update of /cvsroot/playerstage/code/player/server/drivers/vectormap
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11829/server/drivers/vectormap
Modified Files:
dbconn.cc dbconn.h postgis.cc
Log Message:
replaced non portable uint with uint32_t
Index: dbconn.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/vectormap/dbconn.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dbconn.cc 17 Sep 2007 02:18:51 -0000 1.2
--- dbconn.cc 24 Oct 2007 22:32:04 -0000 1.3
***************
*** 28,32 ****
string query_string = "SELECT asbinary(extent(geom)) FROM (SELECT geom FROM
";
! for (uint ii=0; ii<layerNames.size(); ++ii)
{
if (ii == 0)
--- 28,32 ----
string query_string = "SELECT asbinary(extent(geom)) FROM (SELECT geom FROM
";
! for (uint32_t ii=0; ii<layerNames.size(); ++ii)
{
if (ii == 0)
***************
*** 59,63 ****
uint8_t* wkb_temp = reinterpret_cast<uint8_t*>(PQgetvalue(res, 0, 0));
! uint length = PQgetlength(res, 0, 0);
uint8_t* wkb = new uint8_t[length];
memcpy(wkb, wkb_temp, length);
--- 59,63 ----
uint8_t* wkb_temp = reinterpret_cast<uint8_t*>(PQgetvalue(res, 0, 0));
! uint32_t length = PQgetlength(res, 0, 0);
uint8_t* wkb = new uint8_t[length];
memcpy(wkb, wkb_temp, length);
***************
*** 78,82 ****
VectorMapInfoHolder info(srid, extent);
! for (uint i=0; i<layerNames.size(); ++i)
{
info.layers.push_back(GetLayerInfo(layerNames[i].c_str()));
--- 78,82 ----
VectorMapInfoHolder info(srid, extent);
! for (uint32_t i=0; i<layerNames.size(); ++i)
{
info.layers.push_back(GetLayerInfo(layerNames[i].c_str()));
***************
*** 114,118 ****
info.name = layer_name;
! uint length = PQgetlength(res, 0, 0);
uint8_t* wkb = new uint8_t[length];
memcpy(wkb, PQgetvalue(res, 0, 0), length);
--- 114,118 ----
info.name = layer_name;
! uint32_t length = PQgetlength(res, 0, 0);
uint8_t* wkb = new uint8_t[length];
memcpy(wkb, PQgetvalue(res, 0, 0), length);
***************
*** 168,172 ****
}
! BoundingBox PostgresConn::BinaryToBBox(const uint8_t* wkb, uint length)
{
BoundingBox res;
--- 168,172 ----
}
! BoundingBox PostgresConn::BinaryToBBox(const uint8_t* wkb, uint32_t length)
{
BoundingBox res;
***************
*** 229,233 ****
info.layers_count = layers.size();
info.layers = new player_vectormap_layer_info_t[layers.size()];
! for (uint ii=0; ii<layers.size(); ++ii)
{
info.layers[ii] = *(layers[ii].Convert());
--- 229,233 ----
info.layers_count = layers.size();
info.layers = new player_vectormap_layer_info_t[layers.size()];
! for (uint32_t ii=0; ii<layers.size(); ++ii)
{
info.layers[ii] = *(layers[ii].Convert());
***************
*** 262,266 ****
feature_data.wkb_count = wkb.size();
///TODO: Make more efficient
! for (uint ii=0; ii<wkb.size(); ++ii)
{
feature_data.wkb[ii] = wkb[ii];
--- 262,266 ----
feature_data.wkb_count = wkb.size();
///TODO: Make more efficient
! for (uint32_t ii=0; ii<wkb.size(); ++ii)
{
feature_data.wkb[ii] = wkb[ii];
***************
*** 281,285 ****
layer_data.features_count = features.size();
layer_data.features = new player_vectormap_feature_data_t[features.size()];
! for (uint ii=0; ii<features.size(); ++ii)
{
layer_data.features[ii] = *(features[ii].Convert());
--- 281,285 ----
layer_data.features_count = features.size();
layer_data.features = new player_vectormap_feature_data_t[features.size()];
! for (uint32_t ii=0; ii<features.size(); ++ii)
{
layer_data.features[ii] = *(features[ii].Convert());
Index: dbconn.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/vectormap/dbconn.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbconn.h 17 Sep 2007 23:56:23 -0000 1.3
--- dbconn.h 24 Oct 2007 22:32:04 -0000 1.4
***************
*** 6,9 ****
--- 6,10 ----
#include <libplayercore/error.h>
#include <vector>
+ #include <string>
#define MAX_PSQL_STRING 256
***************
*** 106,110 ****
private:
! BoundingBox BinaryToBBox(const uint8_t *binary, uint length);
PGconn *conn;
--- 107,111 ----
private:
! BoundingBox BinaryToBBox(const uint8_t *binary, uint32_t length);
PGconn *conn;
Index: postgis.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/vectormap/postgis.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** postgis.cc 21 Sep 2007 03:31:50 -0000 1.5
--- postgis.cc 24 Oct 2007 22:32:04 -0000 1.6
***************
*** 111,115 ****
#include <libplayercore/playercore.h>
#include <libplayercore/error.h>
- #include <playererror.h>
#include "dbconn.h"
#ifdef HAVE_GEOS
--- 111,114 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
