More floating-point buffer progress

mdboom · mdboom · commit 15d1e4396488 · 2014-11-11T14:50:12.000-05:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -39,7 +39,8 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
     rendererBase.clear(_fill_color);
     rendererAA.attach(rendererBase);
     rendererBin.attach(rendererBase);
-    hatchRenderingBuffer.attach(hatchBuffer, HATCH_SIZE, HATCH_SIZE, HATCH_SIZE * 4);
+    hatchRenderingBuffer.attach(
+        hatchBuffer, HATCH_SIZE, HATCH_SIZE, HATCH_SIZE * sizeof(color_type));
 }
 
 RendererAgg::~RendererAgg()
@@ -95,34 +96,37 @@ void RendererAgg::tostring_rgb(uint8_t *buf)
     agg::rendering_buffer renderingBufferTmp;
     renderingBufferTmp.attach(buf, width, height, row_len);
 
-    agg::color_conv(&renderingBufferTmp, &renderingBuffer, agg::color_conv_rgba32_to_rgb24());
+    agg::convert<agg::pixfmt_rgb24, pixfmt, agg::rendering_buffer>(&renderingBufferTmp, &renderingBuffer);
 }
 
 void RendererAgg::tostring_argb(uint8_t *buf)
 {
     //"Return the rendered buffer as an RGB string";
 
-    int row_len = width * 4;
+    int row_len = width * sizeof(agg::rgba8);
 
     agg::rendering_buffer renderingBufferTmp;
     renderingBufferTmp.attach(buf, width, height, row_len);
-    agg::color_conv(&renderingBufferTmp, &renderingBuffer, agg::color_conv_rgba32_to_argb32());
+
+    agg::convert<agg::pixfmt_argb32, pixfmt, agg::rendering_buffer>(&renderingBufferTmp, &renderingBuffer);
 }
 
 void RendererAgg::tostring_bgra(uint8_t *buf)
 {
     //"Return the rendered buffer as an RGB string";
 
-    int row_len = width * 4;
+    int row_len = width * sizeof(agg::rgba8);
 
     agg::rendering_buffer renderingBufferTmp;
     renderingBufferTmp.attach(buf, width, height, row_len);
 
-    agg::color_conv(&renderingBufferTmp, &renderingBuffer, agg::color_conv_rgba32_to_bgra32());
+    agg::convert<agg::pixfmt_bgra32, pixfmt, agg::rendering_buffer>(&renderingBufferTmp, &renderingBuffer);
 }
 
 agg::rect_i RendererAgg::get_content_extents()
 {
+    // TODO: This is most definitely broken
+
     agg::rect_i r(width, height, 0, 0);
 
     // Looks at the alpha channel to find the minimum extents of the image
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -15,6 +15,7 @@
 #include "agg_image_accessors.h"
 #include "agg_pixfmt_amask_adaptor.h"
 #include "agg_pixfmt_gray.h"
+#include "agg_pixfmt_rgb.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_scanline_aa.h"
 #include "agg_renderer_base.h"
@@ -293,7 +294,7 @@ class RendererAgg
     agg::trans_affine lastclippath_transform;
 
     static const size_t HATCH_SIZE = 72;
-    agg::int8u hatchBuffer[HATCH_SIZE * HATCH_SIZE * 4];
+    agg::int8u hatchBuffer[HATCH_SIZE * HATCH_SIZE * sizeof(color_type)];
     agg::rendering_buffer hatchRenderingBuffer;
 
     agg::rgba _fill_color;
