Clean up some compiler warnings in AGG (celiagg#99)

* Remove register storage class specifiers * Reorder the initializer list of agg::trans_double_path * Silence some compiler warnings
suarezvictor · Mar 24, 2021 · 85a4785 · 85a4785
1 parent 46d7711
commit 85a4785
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/agg-svn/agg-2.4/font_freetype/agg_font_freetype.cpp b/agg-svn/agg-2.4/font_freetype/agg_font_freetype.cpp
@@ -422,12 +422,12 @@ namespace agg
             y += bitmap.rows;
             pitch = -pitch;
         }
-        for(i = 0; i < bitmap.rows; i++)
+        for(i = 0; i < (int)bitmap.rows; i++)
         {
             sl.reset_spans();
             bitset_iterator bits(buf, 0);
             int j;
-            for(j = 0; j < bitmap.width; j++)
+            for(j = 0; j < (int)bitmap.width; j++)
             {
                 if(bits.bit()) sl.add_cell(x + j, cover_full);
                 ++bits;
@@ -463,11 +463,11 @@ namespace agg
             y += bitmap.rows;
             pitch = -pitch;
         }
-        for(i = 0; i < bitmap.rows; i++)
+        for(i = 0; i < (int)bitmap.rows; i++)
         {
             sl.reset_spans();
             const int8u* p = buf;
-            for(j = 0; j < bitmap.width; j++)
+            for(j = 0; j < (int)bitmap.width; j++)
             {
                 if(*p) sl.add_cell(x + j, ras.apply_gamma(*p));
                 ++p;

diff --git a/agg-svn/agg-2.4/include/agg_basics.h b/agg-svn/agg-2.4/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/agg-svn/agg-2.4/include/agg_image_accessors.h b/agg-svn/agg-2.4/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/agg-svn/agg-2.4/include/agg_trans_affine.h b/agg-svn/agg-2.4/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/agg-svn/agg-2.4/src/agg_trans_double_path.cpp b/agg-svn/agg-2.4/src/agg_trans_double_path.cpp
@@ -21,10 +21,10 @@ namespace agg
 
     //------------------------------------------------------------------------
     trans_double_path::trans_double_path() :
-        m_kindex1(0.0),
-        m_kindex2(0.0),
         m_base_length(0.0),
         m_base_height(1.0),
+        m_kindex1(0.0),
+        m_kindex2(0.0),
         m_status1(initial),
         m_status2(initial),
         m_preserve_x_scale(true)