[mapguide-commits] r9184 - sandbox/jng/utfgrid/Common/Renderers

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-05-01 09:24:06 -0700 (Mon, 01 May 2017)
New Revision: 9184

Modified:
   sandbox/jng/utfgrid/Common/Renderers/MapUTFGrid.h
   sandbox/jng/utfgrid/Common/Renderers/agg_utfgrid_context.h
Log:
Remove unnecessary agg headers form agg_utfgrid_context.h. Also apply same warning suppression set as agg_context

Modified: sandbox/jng/utfgrid/Common/Renderers/MapUTFGrid.h
===================================================================
--- sandbox/jng/utfgrid/Common/Renderers/MapUTFGrid.h	2017-05-01 16:17:05 UTC (rev 9183)
+++ sandbox/jng/utfgrid/Common/Renderers/MapUTFGrid.h	2017-05-01 16:24:06 UTC (rev 9184)
@@ -67,7 +67,7 @@
     }
 
     //--------------------------------------------------------------------
-    AGG_INLINE void add(const self_type& c, unsigned cover)
+    AGG_INLINE void add(const self_type& c, unsigned /*cover*/)
     {
         *this = c;
     }

Modified: sandbox/jng/utfgrid/Common/Renderers/agg_utfgrid_context.h
===================================================================
--- sandbox/jng/utfgrid/Common/Renderers/agg_utfgrid_context.h	2017-05-01 16:17:05 UTC (rev 9183)
+++ sandbox/jng/utfgrid/Common/Renderers/agg_utfgrid_context.h	2017-05-01 16:24:06 UTC (rev 9184)
@@ -19,40 +19,22 @@
 #ifndef _AGGUTFGRIDCONTEXT_H_
 #define _AGGUTFGRIDCONTEXT_H_
 
+#pragma warning(push)
+#pragma warning(disable: 4100 4244 4267 4512)
+
 #include <map>
 #include "agg_basics.h"
 #include "agg_rendering_buffer.h"
-#include "agg_scanline_u.h"
 #include "agg_scanline_bin.h"
 #include "agg_renderer_scanline.h"
-#include "agg_renderer_outline_aa.h"
-#include "agg_renderer_outline_image.h"
-#include "agg_renderer_primitives.h"
 #include "agg_rasterizer_scanline_aa.h"
-#include "agg_rasterizer_outline_aa.h"
-#include "agg_rasterizer_outline.h"
-#include "agg_conv_curve.h"
-#include "agg_conv_contour.h"
-#include "agg_pixfmt_rgba.h"
 #include "agg_path_storage.h"
 #include "agg_conv_stroke.h"
-#include "agg_font_freetype.h"
-#include "agg_span_interpolator_linear.h"
-#include "agg_image_accessors.h"
-#include "agg_span_pattern_rgba.h"
-#include "agg_trans_affine.h"
-#include "agg_conv_transform.h"
-#include "agg_span_image_filter_rgba.h"
-#include "agg_span_image_filter_rgb.h"
-#include "agg_span_allocator.h"
-#include "agg_pattern_filters_rgba.h"
-#include "agg_font_freetype.h"
-#include "agg_pixfmt_gray.h"
-#include "agg_pixfmt_amask_adaptor.h"
-#include "agg_alpha_mask_u8.h"
 
 #include "MapUTFGrid.h"
 
+#pragma warning(pop)
+
 typedef agg::int32u utfgrid_band_type;
 typedef agg::row_ptr_cache<utfgrid_band_type> utfgrid_rendering_buffer;
 typedef pixfmt_utf<utfpix32, utfgrid_rendering_buffer> pixfmt_utf32;