Skip to content

Commit 5158178

Browse files
committed
AGG headers: remove use of deprecated register keyword, that is forbidden in C++17
1 parent c16df18 commit 5158178

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

renderers/agg/include/agg_basics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ namespace mapserver
211211
{
212212
AGG_INLINE static unsigned mul(unsigned a, unsigned b)
213213
{
214-
register unsigned q = a * b + (1 << (Shift-1));
214+
const unsigned q = a * b + (1 << (Shift-1));
215215
return (q + (q >> Shift)) >> Shift;
216216
}
217217
};

renderers/agg/include/agg_image_accessors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ namespace mapserver
174174
private:
175175
AGG_INLINE const int8u* pixel() const
176176
{
177-
register int x = m_x;
178-
register int y = m_y;
177+
int x = m_x;
178+
int y = m_y;
179179
if(x < 0) x = 0;
180180
if(y < 0) y = 0;
181181
if(x >= (int)m_pixf->width()) x = m_pixf->width() - 1;

renderers/agg/include/agg_trans_affine.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,25 +292,25 @@ namespace mapserver
292292
//------------------------------------------------------------------------
293293
inline void trans_affine::transform(double* x, double* y) const
294294
{
295-
register double tmp = *x;
295+
const double tmp = *x;
296296
*x = tmp * sx + *y * shx + tx;
297297
*y = tmp * shy + *y * sy + ty;
298298
}
299299

300300
//------------------------------------------------------------------------
301301
inline void trans_affine::transform_2x2(double* x, double* y) const
302302
{
303-
register double tmp = *x;
303+
const double tmp = *x;
304304
*x = tmp * sx + *y * shx;
305305
*y = tmp * shy + *y * sy;
306306
}
307307

308308
//------------------------------------------------------------------------
309309
inline void trans_affine::inverse_transform(double* x, double* y) const
310310
{
311-
register double d = determinant_reciprocal();
312-
register double a = (*x - tx) * d;
313-
register double b = (*y - ty) * d;
311+
const double d = determinant_reciprocal();
312+
const double a = (*x - tx) * d;
313+
const double b = (*y - ty) * d;
314314
*x = a * sy - b * shx;
315315
*y = b * sx - a * shy;
316316
}

0 commit comments

Comments
 (0)