Skip to content

Q
qgroundcontrol
Commit 87aa800c authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Fixed compilation on Mac OS 10.8 / Mountain Lion

parent 106ffa74
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libs/lib/mac64/include/osgDB/Serializer
View file @ 87aa800c
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
if ( _valueToString.find(value)!=_valueToString.end() ) if ( _valueToString.find(value)!=_valueToString.end() )
{ {
osg::notify(osg::WARN) << "Duplicate enum value " << value osg::notify(osg::WARN) << "Duplicate enum value " << value
<< " with old string: " << _valueToString[value] << " with old string: " << _valueToString[value].c_str()
<< " and new string: " << str << std::endl; << " and new string: " << str << std::endl;
} }
_valueToString[value] = str; _valueToString[value] = str;
......
src/ui/map3D/Imagery.cc
View file @ 87aa800c
...@@ -614,7 +614,7 @@ Imagery::getTileLocation(int tileX, int tileY, int zoomLevel, ...@@ -614,7 +614,7 @@ Imagery::getTileLocation(int tileX, int tileY, int zoomLevel,
<< "&y=" << tileY << "&z=" << zoomLevel; << "&y=" << tileY << "&z=" << zoomLevel;
break; break;
case OFFLINE_SATELLITE: case OFFLINE_SATELLITE:
oss << mImageryPath << "/200/color/" << tileY oss << mImageryPath.c_str() << "/200/color/" << tileY
<< "/tile-"; << "/tile-";
if (tileResolution < 1.0) if (tileResolution < 1.0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment