diff --git a/headers/libs/agg/agg_image_accessors.h b/headers/libs/agg/agg_image_accessors.h
index 1dc7189a1f..d551dbc624 100644
--- a/headers/libs/agg/agg_image_accessors.h
+++ b/headers/libs/agg/agg_image_accessors.h
@@ -184,7 +184,7 @@ namespace agg
             m_x = m_x0 = x;
             m_y = y;
             if(y >= 0 && y < (int)m_pixf->height() &&
-               x >= 0 && x+len <= (int)m_pixf->width())
+               x >= 0 && (int)(x+len) <= (int)m_pixf->width())
             {
                 return m_pix_ptr = m_pixf->pix_ptr(x, y);
             }
diff --git a/headers/libs/agg/agg_span_image_filter_rgba.h b/headers/libs/agg/agg_span_image_filter_rgba.h
index 134a802550..d47085cf6c 100644
--- a/headers/libs/agg/agg_span_image_filter_rgba.h
+++ b/headers/libs/agg/agg_span_image_filter_rgba.h
@@ -226,7 +226,7 @@ namespace agg
             value_type back_b = m_back_color.b;
             value_type back_a = m_back_color.a;
 
-            const value_type *fg_ptr;
+            const value_type *fg_ptr = NULL;
             int maxx = base_type::source().width() - 1;
             int maxy = base_type::source().height() - 1;