aboutsummaryrefslogtreecommitdiff
path: root/src/grids.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2021-03-03 17:45:53 +0100
committerEven Rouault <even.rouault@spatialys.com>2021-03-03 17:45:53 +0100
commit095731d53405309c38bebe31af51d141f6319f1a (patch)
treeefa9f1e916c1c1373298900ac4e66702beec8f35 /src/grids.cpp
parent9e2eb067585b9a61b2b5e636547ac80dd4d01d06 (diff)
downloadPROJ-095731d53405309c38bebe31af51d141f6319f1a.tar.gz
PROJ-095731d53405309c38bebe31af51d141f6319f1a.zip
Reformat code with clang-format-10 from ubuntu 20.04
Diffstat (limited to 'src/grids.cpp')
-rw-r--r--src/grids.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/grids.cpp b/src/grids.cpp
index b7ab526a..f67ae42d 100644
--- a/src/grids.cpp
+++ b/src/grids.cpp
@@ -897,8 +897,9 @@ std::unique_ptr<GTiffGrid> GTiffDataset::nextGrid() {
else if (sampleFormat == SAMPLEFORMAT_IEEEFP && bitsPerSample == 64)
dt = TIFFDataType::Float64;
else {
- pj_log(m_ctx, PJ_LOG_ERROR, _("Unsupported combination of SampleFormat "
- "and BitsPerSample values"));
+ pj_log(m_ctx, PJ_LOG_ERROR,
+ _("Unsupported combination of SampleFormat "
+ "and BitsPerSample values"));
return nullptr;
}
@@ -998,8 +999,9 @@ std::unique_ptr<GTiffGrid> GTiffDataset::nextGrid() {
// a GeoTransformationMatrix, since negative values in GeoPixelScale
// have historically been implementation bugs.
if (matrix[1] != 0 || matrix[4] != 0) {
- pj_log(m_ctx, PJ_LOG_ERROR, _("Rotational terms not supported in "
- "GeoTransformationMatrix tag"));
+ pj_log(m_ctx, PJ_LOG_ERROR,
+ _("Rotational terms not supported in "
+ "GeoTransformationMatrix tag"));
return nullptr;
}
@@ -1833,10 +1835,9 @@ bool NTv2Grid::valueAt(int x, int y, bool compensateNTConvention,
float two_float[2];
// NTv2 is organized from east to west !
// there are 4 components: lat shift, lon shift, lat error, lon error
- m_fp->seek(
- m_offset +
- 4 * sizeof(float) *
- (static_cast<unsigned long long>(y) * m_width + m_width - 1 - x));
+ m_fp->seek(m_offset + 4 * sizeof(float) *
+ (static_cast<unsigned long long>(y) * m_width +
+ m_width - 1 - x));
if (m_fp->read(&two_float[0], sizeof(two_float)) != sizeof(two_float)) {
proj_context_errno_set(m_ctx,
PROJ_ERR_INVALID_OP_FILE_NOT_FOUND_OR_INVALID);
@@ -2893,7 +2894,9 @@ ListOfHGrids pj_hgrid_init(PJ *P, const char *gridkey) {
// ---------------------------------------------------------------------------
-typedef struct { pj_int32 lam, phi; } ILP;
+typedef struct {
+ pj_int32 lam, phi;
+} ILP;
// Apply bilinear interpolation for horizontal shift grids
static PJ_LP pj_hgrid_interpolate(PJ_LP t, const HorizontalShiftGrid *grid,