Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
87aa800c
Commit
87aa800c
authored
Sep 16, 2012
by
Lorenz Meier
Browse files
Fixed compilation on Mac OS 10.8 / Mountain Lion
parent
106ffa74
Changes
2
Hide whitespace changes
Inline
Side-by-side
libs/lib/mac64/include/osgDB/Serializer
View file @
87aa800c
...
...
@@ -47,7 +47,7 @@ public:
if
(
_valueToString
.
find
(
value
)
!=
_valueToString
.
end
()
)
{
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
;
}
_valueToString
[
value
]
=
str
;
...
...
src/ui/map3D/Imagery.cc
View file @
87aa800c
...
...
@@ -614,7 +614,7 @@ Imagery::getTileLocation(int tileX, int tileY, int zoomLevel,
<<
"&y="
<<
tileY
<<
"&z="
<<
zoomLevel
;
break
;
case
OFFLINE_SATELLITE
:
oss
<<
mImageryPath
<<
"/200/color/"
<<
tileY
oss
<<
mImageryPath
.
c_str
()
<<
"/200/color/"
<<
tileY
<<
"/tile-"
;
if
(
tileResolution
<
1.0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment