diff --git a/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h b/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h
index 6c3d96fc6160..7729b3359a10 100644
--- a/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h
+++ b/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h
@@ -60,7 +60,7 @@ namespace agg
 
         int not_equal(int ex, int ey, const cell_aa&) const
         {
-            return (ex - x) | (ey - y);
+            return ex != x || ey != y;
         }
     };
 
diff --git a/extern/agg24-svn/include/agg_scanline_storage_aa.h b/extern/agg24-svn/include/agg_scanline_storage_aa.h
index 7148c8992224..b3471fce7682 100644
--- a/extern/agg24-svn/include/agg_scanline_storage_aa.h
+++ b/extern/agg24-svn/include/agg_scanline_storage_aa.h
@@ -720,10 +720,10 @@ namespace agg
             m_ptr = m_data;
             if(m_ptr < m_end)
             {
-                m_min_x = read_int32() + m_dx; 
-                m_min_y = read_int32() + m_dy;
-                m_max_x = read_int32() + m_dx;
-                m_max_y = read_int32() + m_dy;
+                m_min_x = read_int32u() + m_dx;
+                m_min_y = read_int32u() + m_dy;
+                m_max_x = read_int32u() + m_dx;
+                m_max_y = read_int32u() + m_dy;
             }
             return m_ptr < m_end;
         }