Merge pull request #19330 from QuLogic/remove-register

WeatherGod · web-flow · commit 12ed2396e466 · 2021-01-21T18:06:46.000-05:00
Remove register storage class from Agg files.
diff --git a/extern/agg24-svn/include/agg_basics.h b/extern/agg24-svn/include/agg_basics.h
@@ -228,7 +228,7 @@ namespace agg
     {
         AGG_INLINE static unsigned mul(unsigned a, unsigned b)
         {
-            register unsigned q = a * b + (1 << (Shift-1));
+            unsigned q = a * b + (1 << (Shift-1));
             return (q + (q >> Shift)) >> Shift;
         }
     };
diff --git a/extern/agg24-svn/include/agg_image_accessors.h b/extern/agg24-svn/include/agg_image_accessors.h
@@ -174,8 +174,8 @@ namespace agg
     private:
         AGG_INLINE const int8u* pixel() const
         {
-            register int x = m_x;
-            register int y = m_y;
+            int x = m_x;
+            int y = m_y;
             if(x < 0) x = 0;
             if(y < 0) y = 0;
             if(x >= (int)m_pixf->width())  x = m_pixf->width() - 1;
diff --git a/extern/agg24-svn/include/agg_trans_affine.h b/extern/agg24-svn/include/agg_trans_affine.h
@@ -292,25 +292,25 @@ namespace agg
     //------------------------------------------------------------------------
     inline void trans_affine::transform(double* x, double* y) const
     {
-        register double tmp = *x;
+        double tmp = *x;
         *x = tmp * sx  + *y * shx + tx;
         *y = tmp * shy + *y * sy  + ty;
     }
 
     //------------------------------------------------------------------------
     inline void trans_affine::transform_2x2(double* x, double* y) const
     {
-        register double tmp = *x;
+        double tmp = *x;
         *x = tmp * sx  + *y * shx;
         *y = tmp * shy + *y * sy;
     }
 
     //------------------------------------------------------------------------
     inline void trans_affine::inverse_transform(double* x, double* y) const
     {
-        register double d = determinant_reciprocal();
-        register double a = (*x - tx) * d;
-        register double b = (*y - ty) * d;
+        double d = determinant_reciprocal();
+        double a = (*x - tx) * d;
+        double b = (*y - ty) * d;
         *x = a * sy - b * shx;
         *y = b * sx - a * shy;
     }
diff --git a/extern/agg24-svn/src/platform/win32/agg_platform_support.cpp b/extern/agg24-svn/src/platform/win32/agg_platform_support.cpp
@@ -1480,7 +1480,7 @@ namespace agg
         tok.len = 0;
         if(m_src_string == 0 || m_start == -1) return tok;
 
-        register const char *pstr = m_src_string + m_start;
+        const char *pstr = m_src_string + m_start;
 
         if(*pstr == 0) 
         {

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ namespace agg`
`228`	`228`	`{`
`229`	`229`	`AGG_INLINE static unsigned mul(unsigned a, unsigned b)`
`230`	`230`	`{`
`231`		`- register unsigned q = a * b + (1 << (Shift-1));`
	`231`	`+ unsigned q = a * b + (1 << (Shift-1));`
`232`	`232`	`return (q + (q >> Shift)) >> Shift;`
`233`	`233`	`}`
`234`	`234`	`};`
Original file line number	Diff line number	Diff line change
`@@ -292,25 +292,25 @@ namespace agg`
`292`	`292`	`//------------------------------------------------------------------------`
`293`	`293`	`inline void trans_affine::transform(double* x, double* y) const`
`294`	`294`	`{`
`295`		`- register double tmp = *x;`
	`295`	`+ double tmp = *x;`
`296`	`296`	`x = tmp sx + y shx + tx;`
`297`	`297`	`y = tmp shy + y sy + ty;`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`//------------------------------------------------------------------------`
`301`	`301`	`inline void trans_affine::transform_2x2(double* x, double* y) const`
`302`	`302`	`{`
`303`		`- register double tmp = *x;`
	`303`	`+ double tmp = *x;`
`304`	`304`	`x = tmp sx + y shx;`
`305`	`305`	`y = tmp shy + y sy;`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`//------------------------------------------------------------------------`
`309`	`309`	`inline void trans_affine::inverse_transform(double* x, double* y) const`
`310`	`310`	`{`
`311`		`- register double d = determinant_reciprocal();`
`312`		`- register double a = (x - tx) d;`
`313`		`- register double b = (y - ty) d;`
	`311`	`+ double d = determinant_reciprocal();`
	`312`	`+ double a = (x - tx) d;`
	`313`	`+ double b = (y - ty) d;`
`314`	`314`	`x = a sy - b * shx;`
`315`	`315`	`y = b sx - a * shy;`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1480,7 +1480,7 @@ namespace agg`
`1480`	`1480`	`tok.len = 0;`
`1481`	`1481`	`if(m_src_string == 0 \|\| m_start == -1) return tok;`
`1482`	`1482`
`1483`		`- register const char *pstr = m_src_string + m_start;`
	`1483`	`+ const char *pstr = m_src_string + m_start;`
`1484`	`1484`
`1485`	`1485`	`if(*pstr == 0)`
`1486`	`1486`	`{`