Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gwaldron/osgearth
Browse files Browse the repository at this point in the history
  • Loading branch information
gwaldron committed Dec 19, 2024
2 parents 8de2858 + 261b208 commit c4d25b4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/osgEarth/AtlasBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ AtlasBuilder::build(const ResourceLibrary* inputLib,
{
OE_WARN << LC <<
"Found an image with more than one layer. You cannot create an "
"altas from another atlas. Stopping." << std::endl;
"atlas from another atlas. Stopping." << std::endl;
return false;
}

Expand Down Expand Up @@ -204,7 +204,7 @@ AtlasBuilder::build(const ResourceLibrary* inputLib,
else
{
OE_WARN << LC << "Failed to load image from catalog: \""
<< skin->name() << "\" ... skipped" << std::endl;
<< *skin->name() << "\" ... skipped" << std::endl;
}
}

Expand All @@ -228,7 +228,7 @@ AtlasBuilder::build(const ResourceLibrary* inputLib,
unsigned t = mainAtlasList[r]->_image->t();

OE_INFO << LC
<< "Altas image " << r << ": size = (" << s << ", " << t << ")" << std::endl;
<< "Atlas image " << r << ": size = (" << s << ", " << t << ")" << std::endl;

if ( s > maxS )
maxS = s;
Expand Down

0 comments on commit c4d25b4

Please sign in to comment.