Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MetaTile: Fixed erroneous typename usage #2685

Merged
merged 1 commit into from
Jan 10, 2025
Merged

MetaTile: Fixed erroneous typename usage #2685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/osgEarth/MetaTile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ namespace osgEarth { namespace Util
osg::Matrix _scale_bias; // scale/bias matrix of _centerKey
unsigned _width, _height;

typename Tile* getTile(int tx, int ty);
bool getTileAndPixelCoords(double u, double v, typename Tile*& tile, double& s, double& t);
Tile* getTile(int tx, int ty);
bool getTileAndPixelCoords(double u, double v, Tile*& tile, double& s, double& t);
};

template<typename T>
Expand Down Expand Up @@ -452,7 +452,7 @@ namespace osgEarth { namespace Util
int ty = (int)v;

// Anchor:
typename Tile* p00_tile = getTile(tx, ty);
Tile* p00_tile = getTile(tx, ty);
if (!p00_tile)
return false;

Expand Down Expand Up @@ -485,23 +485,23 @@ namespace osgEarth { namespace Util
}

// Neighbors:
typename Tile* p10_tile = p00_tile;
Tile* p10_tile = p00_tile;
double p10_s = p00_s + delta_s, p10_t = p00_t;
if (p10_s >= (double)_width || p10_s < 0)
{
p10_tile = getTile(tx + delta_s, ty);
p10_s -= (double)_width * delta_s;
}

typename Tile* p01_tile = p00_tile;
Tile* p01_tile = p00_tile;
double p01_s = p00_s, p01_t = p00_t + delta_t;
if (p01_t >= _height || p01_t < 0)
{
p01_tile = getTile(tx, ty + delta_t);
p01_t -= (double)_height * (double)delta_t;
}

typename Tile* p11_tile = p00_tile;
Tile* p11_tile = p00_tile;
double p11_s = p00_s + delta_s, p11_t = p00_t + delta_t;
int ntx = tx, nty = ty;
if (p11_s >= (double)_width || p11_s < 0)
Expand Down
Loading