diff options
| author | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-04-07 20:01:46 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-04-07 20:01:46 +0000 |
| commit | 66f5b4e5f1031431b33e7a1965b5a30a68f1c4bb (patch) | |
| tree | 0a64fa864418da40d86a211e5218122da51d56fd /src/grids.cpp | |
| parent | e62a4a4cb03a7e07fbcd33fe385e5909aab1516b (diff) | |
| download | PROJ-66f5b4e5f1031431b33e7a1965b5a30a68f1c4bb.tar.gz PROJ-66f5b4e5f1031431b33e7a1965b5a30a68f1c4bb.zip | |
Test GCC 4.8 and CMake 3.9; resolve a few shadowed declaration warnings
Diffstat (limited to 'src/grids.cpp')
| -rw-r--r-- | src/grids.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/grids.cpp b/src/grids.cpp index c5fc6c74..58183e9e 100644 --- a/src/grids.cpp +++ b/src/grids.cpp @@ -96,9 +96,9 @@ bool ExtentAndRes::intersects(const ExtentAndRes &other) const { // --------------------------------------------------------------------------- -Grid::Grid(const std::string &name, int widthIn, int heightIn, +Grid::Grid(const std::string &nameIn, int widthIn, int heightIn, const ExtentAndRes &extentIn) - : m_name(name), m_width(widthIn), m_height(heightIn), m_extent(extentIn) {} + : m_name(nameIn), m_width(widthIn), m_height(heightIn), m_extent(extentIn) {} // --------------------------------------------------------------------------- @@ -479,7 +479,7 @@ GTiffGrid::GTiffGrid(PJ_CONTEXT *ctx, TIFF *hTIFF, BlockCache &cache, File *fp, std::string value; value.append(endTag + 1, endValue - (endTag + 1)); - std::string name; + std::string gridName; auto namePos = tag.find("name=\""); if (namePos == std::string::npos) break; @@ -488,7 +488,7 @@ GTiffGrid::GTiffGrid(PJ_CONTEXT *ctx, TIFF *hTIFF, BlockCache &cache, File *fp, const auto endQuote = tag.find('"', namePos); if (endQuote == std::string::npos) break; - name = tag.substr(namePos, endQuote - namePos); + gridName = tag.substr(namePos, endQuote - namePos); } const auto samplePos = tag.find("sample=\""); @@ -497,7 +497,7 @@ GTiffGrid::GTiffGrid(PJ_CONTEXT *ctx, TIFF *hTIFF, BlockCache &cache, File *fp, sample = atoi(tag.c_str() + samplePos + strlen("sample=\"")); } - m_metadata[std::pair<int, std::string>(sample, name)] = value; + m_metadata[std::pair<int, std::string>(sample, gridName)] = value; auto rolePos = tag.find("role=\""); if (rolePos != std::string::npos) { |