Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixing build of tools

Browse Source
This commit is contained in:
Dennis Luxen 2013-08-06 12:28:19 +02:00
parent 13f5baf608
commit 0f8239bc8e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Algorithms/StronglyConnectedComponents.h
View File

@ -350,9 +350,10 @@ public:
OGRFeature *poFeature; OGRFeature *poFeature;
poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() ); poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
poFeature->SetGeometry( &lineString ); poFeature->SetGeometry( &lineString );
if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE ) if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE ) {
{ throw OSRMException(
ERR( "Failed to create feature in shapefile.\n" ); "Failed to create feature in shapefile."
);
} }
OGRFeature::DestroyFeature( poFeature ); OGRFeature::DestroyFeature( poFeature );
} }

8
Tools/componentAnalysis.cpp
View File

@ -28,6 +28,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../Util/BaseConfiguration.h" #include "../Util/BaseConfiguration.h"
#include "../Util/InputFileUtil.h" #include "../Util/InputFileUtil.h"
#include "../Util/GraphLoader.h" #include "../Util/GraphLoader.h"
#include "../Util/OSRMException.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <fstream> #include <fstream>
@ -48,13 +49,14 @@ std::vector<NodeID> traffic_light_node_IDs_vector;
int main (int argument_count, char *argument_values[]) { int main (int argument_count, char *argument_values[]) {
if(argument_count < 3) { if(argument_count < 3) {
ERR("usage:\n" << argument_values[0] << " <osrm> <osrm.restrictions>"); std::cerr << "usage:\n" << argument_values[0] << " <osrm> <osrm.restrictions>" << std::endl;
return -1;
} }
INFO("Using restrictions from file: " << argument_values[2]); INFO("Using restrictions from file: " << argument_values[2]);
std::ifstream restriction_ifstream(argument_values[2], std::ios::binary); std::ifstream restriction_ifstream(argument_values[2], std::ios::binary);
if(!restriction_ifstream.good()) { if(!restriction_ifstream.good()) {
ERR("Could not access <osrm-restrictions> files"); throw OSRMException("Could not access <osrm-restrictions> files");
} }
uint32_t usable_restriction_count = 0; uint32_t usable_restriction_count = 0;
restriction_ifstream.read( restriction_ifstream.read(
@ -76,7 +78,7 @@ int main (int argument_count, char *argument_values[]) {
); );
if (!input_stream.is_open()) { if (!input_stream.is_open()) {
ERR("Cannot open " << argument_values[1]); throw OSRMException("Cannot open osrm file");
} }
std::vector<ImportEdge> edge_list; std::vector<ImportEdge> edge_list;