diff --git a/include/mapnik/image_any.hpp b/include/mapnik/image_any.hpp index 58fd0d0b7..054c57fc0 100644 --- a/include/mapnik/image_any.hpp +++ b/include/mapnik/image_any.hpp @@ -53,9 +53,9 @@ struct image_data_null using image_data_base = util::variant; + image_gray8, + image_gray16, + image_gray32f>; // Forward declaring struct image_any; @@ -208,11 +208,11 @@ inline image_any create_image_any(int width, switch (type) { case image_dtype_gray8: - return image_any(std::move(image_data_gray8(width, height, initialize, premultiplied, painted))); + return image_any(std::move(image_gray8(width, height, initialize, premultiplied, painted))); case image_dtype_gray16: - return image_any(std::move(image_data_gray16(width, height, initialize, premultiplied, painted))); + return image_any(std::move(image_gray16(width, height, initialize, premultiplied, painted))); case image_dtype_gray32f: - return image_any(std::move(image_data_gray32f(width, height, initialize, premultiplied, painted))); + return image_any(std::move(image_gray32f(width, height, initialize, premultiplied, painted))); case image_dtype_null: return image_any(std::move(image_data_null())); case image_dtype_rgba8: diff --git a/include/mapnik/image_data.hpp b/include/mapnik/image_data.hpp index 153e9a3b8..8736ae605 100644 --- a/include/mapnik/image_data.hpp +++ b/include/mapnik/image_data.hpp @@ -278,9 +278,9 @@ private: }; using image_rgba8 = image_data; -using image_data_gray8 = image_data ; -using image_data_gray16 = image_data; -using image_data_gray32f = image_data; +using image_gray8 = image_data ; +using image_gray16 = image_data; +using image_gray32f = image_data; enum image_dtype { diff --git a/include/mapnik/image_scaling_traits.hpp b/include/mapnik/image_scaling_traits.hpp index 47b47e331..c891b37df 100644 --- a/include/mapnik/image_scaling_traits.hpp +++ b/include/mapnik/image_scaling_traits.hpp @@ -50,7 +50,7 @@ struct agg_scaling_traits }; template <> -struct agg_scaling_traits +struct agg_scaling_traits { using pixfmt_pre = agg::pixfmt_gray8_pre; using color_type = agg::gray8; @@ -61,7 +61,7 @@ struct agg_scaling_traits }; template <> -struct agg_scaling_traits +struct agg_scaling_traits { using pixfmt_pre = agg::pixfmt_gray16_pre; using color_type = agg::gray16; @@ -72,7 +72,7 @@ struct agg_scaling_traits }; template <> -struct agg_scaling_traits +struct agg_scaling_traits { using pixfmt_pre = agg::pixfmt_gray32_pre; using color_type = agg::gray32; diff --git a/include/mapnik/image_view.hpp b/include/mapnik/image_view.hpp index 6c0e9ac94..0c9a45e82 100644 --- a/include/mapnik/image_view.hpp +++ b/include/mapnik/image_view.hpp @@ -119,9 +119,9 @@ private: }; using image_view_rgba8 = image_view; -using image_view_gray8 = image_view; -using image_view_gray16 = image_view; -using image_view_gray32f = image_view; +using image_view_gray8 = image_view; +using image_view_gray16 = image_view; +using image_view_gray32f = image_view; } // end ns diff --git a/include/mapnik/miniz_png.hpp b/include/mapnik/miniz_png.hpp index e5e00748c..9d36f3bbc 100644 --- a/include/mapnik/miniz_png.hpp +++ b/include/mapnik/miniz_png.hpp @@ -83,7 +83,7 @@ private: static const unsigned char IEND_tpl[]; }; -extern template MAPNIK_DECL void PNGWriter::writeIDAT(image_data_gray8 const& image); +extern template MAPNIK_DECL void PNGWriter::writeIDAT(image_gray8 const& image); extern template MAPNIK_DECL void PNGWriter::writeIDAT(image_view_gray8 const& image); extern template MAPNIK_DECL void PNGWriter::writeIDAT(image_rgba8 const& image); extern template MAPNIK_DECL void PNGWriter::writeIDAT(image_view_rgba8 const& image); diff --git a/include/mapnik/png_io.hpp b/include/mapnik/png_io.hpp index de504a3a6..0aa3afc01 100644 --- a/include/mapnik/png_io.hpp +++ b/include/mapnik/png_io.hpp @@ -149,7 +149,7 @@ void save_as_png(T1 & file, template void reduce_8(T const& in, - image_data_gray8 & out, + image_gray8 & out, octree trees[], unsigned limits[], unsigned levels, @@ -167,7 +167,7 @@ void reduce_8(T const& in, for (unsigned y = 0; y < height; ++y) { mapnik::image_rgba8::pixel_type const * row = in.getRow(y); - mapnik::image_data_gray8::pixel_type * row_out = out.getRow(y); + mapnik::image_gray8::pixel_type * row_out = out.getRow(y); for (unsigned x = 0; x < width; ++x) { unsigned val = row[x]; @@ -200,7 +200,7 @@ void reduce_8(T const& in, template void reduce_4(T const& in, - image_data_gray8 & out, + image_gray8 & out, octree trees[], unsigned limits[], unsigned levels, @@ -218,7 +218,7 @@ void reduce_4(T const& in, for (unsigned y = 0; y < height; ++y) { mapnik::image_rgba8::pixel_type const * row = in.getRow(y); - mapnik::image_data_gray8::pixel_type * row_out = out.getRow(y); + mapnik::image_gray8::pixel_type * row_out = out.getRow(y); for (unsigned x = 0; x < width; ++x) { unsigned val = row[x]; @@ -256,7 +256,7 @@ void reduce_4(T const& in, // 1-bit but only one color. template void reduce_1(T const&, - image_data_gray8 & out, + image_gray8 & out, octree /*trees*/[], unsigned /*limits*/[], std::vector & /*alpha*/) @@ -266,7 +266,7 @@ void reduce_1(T const&, template void save_as_png(T & file, std::vector const& palette, - mapnik::image_data_gray8 const& image, + mapnik::image_gray8 const& image, unsigned width, unsigned height, unsigned color_depth, @@ -556,7 +556,7 @@ void save_as_png8_oct(T1 & file, if (palette.size() > 16 ) { // >16 && <=256 colors -> write 8-bit color depth - image_data_gray8 reduced_image(width,height); + image_gray8 reduced_image(width,height); reduce_8(image, reduced_image, trees, limits, TRANSPARENCY_LEVELS, alphaTable); save_as_png(file,palette,reduced_image,width,height,8,alphaTable,opts); } @@ -565,7 +565,7 @@ void save_as_png8_oct(T1 & file, // 1 color image -> write 1-bit color depth PNG unsigned image_width = ((width + 15) >> 3) & ~1U; // 1-bit image, round up to 16-bit boundary unsigned image_height = height; - image_data_gray8 reduced_image(image_width,image_height); + image_gray8 reduced_image(image_width,image_height); reduce_1(image,reduced_image,trees, limits, alphaTable); if (meanAlpha<255 && cols[0]==0) { @@ -579,7 +579,7 @@ void save_as_png8_oct(T1 & file, // <=16 colors -> write 4-bit color depth PNG unsigned image_width = ((width + 7) >> 1) & ~3U; // 4-bit image, round up to 32-bit boundary unsigned image_height = height; - image_data_gray8 reduced_image(image_width,image_height); + image_gray8 reduced_image(image_width,image_height); reduce_4(image, reduced_image, trees, limits, TRANSPARENCY_LEVELS, alphaTable); save_as_png(file,palette,reduced_image,width,height,4,alphaTable,opts); } @@ -600,11 +600,11 @@ void save_as_png8(T1 & file, if (palette.size() > 16 ) { // >16 && <=256 colors -> write 8-bit color depth - image_data_gray8 reduced_image(width, height); + image_gray8 reduced_image(width, height); for (unsigned y = 0; y < height; ++y) { mapnik::image_rgba8::pixel_type const * row = image.getRow(y); - mapnik::image_data_gray8::pixel_type * row_out = reduced_image.getRow(y); + mapnik::image_gray8::pixel_type * row_out = reduced_image.getRow(y); for (unsigned x = 0; x < width; ++x) { row_out[x] = tree.quantize(row[x]); @@ -617,7 +617,7 @@ void save_as_png8(T1 & file, // 1 color image -> write 1-bit color depth PNG unsigned image_width = ((width + 15) >> 3) & ~1U; // 1-bit image, round up to 16-bit boundary unsigned image_height = height; - image_data_gray8 reduced_image(image_width, image_height); + image_gray8 reduced_image(image_width, image_height); reduced_image.set(0); save_as_png(file, palette, reduced_image, width, height, 1, alphaTable, opts); } @@ -626,11 +626,11 @@ void save_as_png8(T1 & file, // <=16 colors -> write 4-bit color depth PNG unsigned image_width = ((width + 7) >> 1) & ~3U; // 4-bit image, round up to 32-bit boundary unsigned image_height = height; - image_data_gray8 reduced_image(image_width, image_height); + image_gray8 reduced_image(image_width, image_height); for (unsigned y = 0; y < height; ++y) { mapnik::image_rgba8::pixel_type const * row = image.getRow(y); - mapnik::image_data_gray8::pixel_type * row_out = reduced_image.getRow(y); + mapnik::image_gray8::pixel_type * row_out = reduced_image.getRow(y); byte index = 0; for (unsigned x = 0; x < width; ++x) { diff --git a/include/mapnik/renderer_common/process_group_symbolizer.hpp b/include/mapnik/renderer_common/process_group_symbolizer.hpp index bb9359014..f0b7e2f75 100644 --- a/include/mapnik/renderer_common/process_group_symbolizer.hpp +++ b/include/mapnik/renderer_common/process_group_symbolizer.hpp @@ -151,9 +151,9 @@ struct raster_marker_render_thunk : util::noncopyable }; template struct raster_marker_render_thunk; -template struct raster_marker_render_thunk; -template struct raster_marker_render_thunk; -template struct raster_marker_render_thunk; +template struct raster_marker_render_thunk; +template struct raster_marker_render_thunk; +template struct raster_marker_render_thunk; using helper_ptr = std::unique_ptr; @@ -185,9 +185,9 @@ struct text_render_thunk : util::noncopyable using render_thunk = util::variant, - raster_marker_render_thunk, - raster_marker_render_thunk, - raster_marker_render_thunk, + raster_marker_render_thunk, + raster_marker_render_thunk, + raster_marker_render_thunk, text_render_thunk>; using render_thunk_ptr = std::unique_ptr; using render_thunk_list = std::list; diff --git a/include/mapnik/tiff_io.hpp b/include/mapnik/tiff_io.hpp index 17ce9da0b..0a27ebf75 100644 --- a/include/mapnik/tiff_io.hpp +++ b/include/mapnik/tiff_io.hpp @@ -216,7 +216,7 @@ struct tag_setter } } - inline void operator() (image_data_gray32f const&) const + inline void operator() (image_gray32f const&) const { TIFFSetField(output_, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); TIFFSetField(output_, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP); @@ -229,7 +229,7 @@ struct tag_setter TIFFSetField(output_, TIFFTAG_PREDICTOR, PREDICTOR_FLOATINGPOINT); } } - inline void operator() (image_data_gray16 const&) const + inline void operator() (image_gray16 const&) const { TIFFSetField(output_, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); TIFFSetField(output_, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); @@ -243,7 +243,7 @@ struct tag_setter } } - inline void operator() (image_data_gray8 const&) const + inline void operator() (image_gray8 const&) const { TIFFSetField(output_, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); TIFFSetField(output_, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); diff --git a/plugins/input/gdal/gdal_featureset.cpp b/plugins/input/gdal/gdal_featureset.cpp index 4bcc52450..3d889215c 100644 --- a/plugins/input/gdal/gdal_featureset.cpp +++ b/plugins/input/gdal/gdal_featureset.cpp @@ -203,7 +203,7 @@ feature_ptr gdal_featureset::get_feature(mapnik::query const& q) MAPNIK_LOG_DEBUG(gdal) << "gdal_featureset: Reading band=" << band_; if (band_ > 0) // we are querying a single band { - mapnik::image_data_gray16 image(im_width, im_height); + mapnik::image_gray16 image(im_width, im_height); image.set(std::numeric_limits::max()); if (band_ > nbands_) { diff --git a/plugins/input/pgraster/pgraster_wkb_reader.cpp b/plugins/input/pgraster/pgraster_wkb_reader.cpp index 462a5881b..11e19d2c4 100644 --- a/plugins/input/pgraster/pgraster_wkb_reader.cpp +++ b/plugins/input/pgraster/pgraster_wkb_reader.cpp @@ -183,7 +183,7 @@ mapnik::raster_ptr read_data_band(mapnik::box2d const& bbox, uint16_t width, uint16_t height, bool hasnodata, T reader) { - mapnik::image_data_gray32f image(width, height); + mapnik::image_gray32f image(width, height); //image.set(std::numeric_limits::max()); // Start with plain white (ABGR or RGBA depending on endiannes) // TODO: set to transparent instead? diff --git a/src/agg/process_group_symbolizer.cpp b/src/agg/process_group_symbolizer.cpp index 0c5c8128c..bd7db6c05 100644 --- a/src/agg/process_group_symbolizer.cpp +++ b/src/agg/process_group_symbolizer.cpp @@ -112,19 +112,19 @@ struct thunk_renderer render_raster_marker(renb, *ras_ptr_, thunk.src_, offset_tr, thunk.opacity_, common_.scale_factor_, thunk.snap_to_pixels_); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray8 type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray8 type is not supported currently by the image_rgba8 renderer"); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray16 type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray16 type is not supported currently by the image_rgba8 renderer"); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray32f type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray32f type is not supported currently by the image_rgba8 renderer"); } void operator()(text_render_thunk const &thunk) const diff --git a/src/grid/process_group_symbolizer.cpp b/src/grid/process_group_symbolizer.cpp index 7ec0a69cd..bcc788a92 100644 --- a/src/grid/process_group_symbolizer.cpp +++ b/src/grid/process_group_symbolizer.cpp @@ -119,19 +119,19 @@ struct thunk_renderer pixmap_.add_feature(feature_); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray8 type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray8 type is not supported currently by the image_rgba8 renderer"); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray16 type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray16 type is not supported currently by the image_rgba8 renderer"); } - void operator()(raster_marker_render_thunk const &thunk) const + void operator()(raster_marker_render_thunk const &thunk) const { - throw std::runtime_error("Rendering of this image_data_gray32f type is not supported currently by the image_rgba8 renderer"); + throw std::runtime_error("Rendering of this image_gray32f type is not supported currently by the image_rgba8 renderer"); } void operator()(text_render_thunk const &thunk) const diff --git a/src/image_compositing.cpp b/src/image_compositing.cpp index ea776a282..ea7a8a3d4 100644 --- a/src/image_compositing.cpp +++ b/src/image_compositing.cpp @@ -182,12 +182,12 @@ MAPNIK_DECL void composite(image_rgba8 & dst, image_rgba8 const& src, composite_ } template <> -MAPNIK_DECL void composite(image_data_gray32f & dst, image_data_gray32f const& src, composite_mode_e mode, +MAPNIK_DECL void composite(image_gray32f & dst, image_gray32f const& src, composite_mode_e mode, float opacity, int dx, int dy) { - using const_rendering_buffer = detail::rendering_buffer; + using const_rendering_buffer = detail::rendering_buffer; using src_pixfmt_type = agg::pixfmt_alpha_blend_gray, const_rendering_buffer, 1, 0>; using dst_pixfmt_type = agg::pixfmt_alpha_blend_gray, agg::rendering_buffer, 1, 0>; using renderer_type = agg::renderer_base; @@ -239,9 +239,9 @@ void composite_visitor::operator() (image_rgba8 & dst) } template <> -void composite_visitor::operator() (image_data_gray32f & dst) +void composite_visitor::operator() (image_gray32f & dst) { - composite(dst, util::get(src_), mode_, opacity_, dx_, dy_); + composite(dst, util::get(src_), mode_, opacity_, dx_, dy_); } } // end ns diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp index d93ce64e2..24ea59ffc 100644 --- a/src/image_scaling.cpp +++ b/src/image_scaling.cpp @@ -168,13 +168,13 @@ void scale_image_agg(T & target, T const& source, scaling_method_e scaling_metho template MAPNIK_DECL void scale_image_agg(image_rgba8 &, image_rgba8 const&, scaling_method_e, double, double , double, double , double); -template MAPNIK_DECL void scale_image_agg(image_data_gray8 &, image_data_gray8 const&, scaling_method_e, +template MAPNIK_DECL void scale_image_agg(image_gray8 &, image_gray8 const&, scaling_method_e, double, double , double, double , double); -template MAPNIK_DECL void scale_image_agg(image_data_gray16 &, image_data_gray16 const&, scaling_method_e, +template MAPNIK_DECL void scale_image_agg(image_gray16 &, image_gray16 const&, scaling_method_e, double, double , double, double , double); -template MAPNIK_DECL void scale_image_agg(image_data_gray32f &, image_data_gray32f const&, scaling_method_e, +template MAPNIK_DECL void scale_image_agg(image_gray32f &, image_gray32f const&, scaling_method_e, double, double , double, double , double); } diff --git a/src/image_util.cpp b/src/image_util.cpp index de5c21f3c..db064a554 100644 --- a/src/image_util.cpp +++ b/src/image_util.cpp @@ -422,9 +422,9 @@ struct is_solid_visitor }; template bool is_solid_visitor::operator() (image_rgba8 const& data); -template bool is_solid_visitor::operator() (image_data_gray8 const& data); -template bool is_solid_visitor::operator() (image_data_gray16 const& data); -template bool is_solid_visitor::operator() (image_data_gray32f const& data); +template bool is_solid_visitor::operator() (image_gray8 const& data); +template bool is_solid_visitor::operator() (image_gray16 const& data); +template bool is_solid_visitor::operator() (image_gray32f const& data); template bool is_solid_visitor::operator() (image_view_rgba8 const& data); template bool is_solid_visitor::operator() (image_view_gray8 const& data); template bool is_solid_visitor::operator() (image_view_gray16 const& data); diff --git a/src/image_util_jpeg.cpp b/src/image_util_jpeg.cpp index cc0e6c651..523f73b06 100644 --- a/src/image_util_jpeg.cpp +++ b/src/image_util_jpeg.cpp @@ -88,9 +88,9 @@ void jpeg_saver::operator() (T const& image) const throw ImageWriterException("Mapnik does not support jpeg grayscale images"); } -template void jpeg_saver::operator() (image_data_gray8 const& image) const; -template void jpeg_saver::operator() (image_data_gray16 const& image) const; -template void jpeg_saver::operator() (image_data_gray32f const& image) const; +template void jpeg_saver::operator() (image_gray8 const& image) const; +template void jpeg_saver::operator() (image_gray16 const& image) const; +template void jpeg_saver::operator() (image_gray32f const& image) const; template void jpeg_saver::operator() (image_view_gray8 const& image) const; template void jpeg_saver::operator() (image_view_gray16 const& image) const; template void jpeg_saver::operator() (image_view_gray32f const& image) const; diff --git a/src/image_util_png.cpp b/src/image_util_png.cpp index 78ced0e0a..41c293a1d 100644 --- a/src/image_util_png.cpp +++ b/src/image_util_png.cpp @@ -308,15 +308,15 @@ void png_saver_pal::operator() (T const& image) const #endif } -template void png_saver::operator() (image_data_gray8 const& image) const; -template void png_saver::operator() (image_data_gray16 const& image) const; -template void png_saver::operator() (image_data_gray32f const& image) const; +template void png_saver::operator() (image_gray8 const& image) const; +template void png_saver::operator() (image_gray16 const& image) const; +template void png_saver::operator() (image_gray32f const& image) const; template void png_saver::operator() (image_view_gray8 const& image) const; template void png_saver::operator() (image_view_gray16 const& image) const; template void png_saver::operator() (image_view_gray32f const& image) const; -template void png_saver_pal::operator() (image_data_gray8 const& image) const; -template void png_saver_pal::operator() (image_data_gray16 const& image) const; -template void png_saver_pal::operator() (image_data_gray32f const& image) const; +template void png_saver_pal::operator() (image_gray8 const& image) const; +template void png_saver_pal::operator() (image_gray16 const& image) const; +template void png_saver_pal::operator() (image_gray32f const& image) const; template void png_saver_pal::operator() (image_view_gray8 const& image) const; template void png_saver_pal::operator() (image_view_gray16 const& image) const; template void png_saver_pal::operator() (image_view_gray32f const& image) const; diff --git a/src/image_util_tiff.cpp b/src/image_util_tiff.cpp index 3da0136bf..75935f599 100644 --- a/src/image_util_tiff.cpp +++ b/src/image_util_tiff.cpp @@ -182,9 +182,9 @@ void tiff_saver::operator() (T const& image) const } template void tiff_saver::operator() (image_rgba8 const& image) const; -template void tiff_saver::operator() (image_data_gray8 const& image) const; -template void tiff_saver::operator() (image_data_gray16 const& image) const; -template void tiff_saver::operator() (image_data_gray32f const& image) const; +template void tiff_saver::operator() (image_gray8 const& image) const; +template void tiff_saver::operator() (image_gray16 const& image) const; +template void tiff_saver::operator() (image_gray32f const& image) const; template void tiff_saver::operator() (image_view_rgba8 const& image) const; template void tiff_saver::operator() (image_view_gray8 const& image) const; template void tiff_saver::operator() (image_view_gray16 const& image) const; diff --git a/src/image_util_webp.cpp b/src/image_util_webp.cpp index 96b82bf82..a46a4954c 100644 --- a/src/image_util_webp.cpp +++ b/src/image_util_webp.cpp @@ -378,9 +378,9 @@ void webp_saver::operator() (T const& image) const } template void webp_saver::operator() (image_rgba8 const& image) const; -template void webp_saver::operator() (image_data_gray8 const& image) const; -template void webp_saver::operator() (image_data_gray16 const& image) const; -template void webp_saver::operator() (image_data_gray32f const& image) const; +template void webp_saver::operator() (image_gray8 const& image) const; +template void webp_saver::operator() (image_gray16 const& image) const; +template void webp_saver::operator() (image_gray32f const& image) const; template void webp_saver::operator() (image_view_rgba8 const& image) const; template void webp_saver::operator() (image_view_gray8 const& image) const; template void webp_saver::operator() (image_view_gray16 const& image) const; diff --git a/src/miniz_png.cpp b/src/miniz_png.cpp index b4ee851de..cae070435 100644 --- a/src/miniz_png.cpp +++ b/src/miniz_png.cpp @@ -361,7 +361,7 @@ const mz_uint8 PNGWriter::IEND_tpl[] = { 'I', 'E', 'N', 'D' // "IEND" }; -template void PNGWriter::writeIDAT(image_data_gray8 const& image); +template void PNGWriter::writeIDAT(image_gray8 const& image); template void PNGWriter::writeIDAT(image_view_gray8 const& image); template void PNGWriter::writeIDAT(image_rgba8 const& image); template void PNGWriter::writeIDAT(image_view_rgba8 const& image); diff --git a/src/raster_colorizer.cpp b/src/raster_colorizer.cpp index f3bf48ea0..21f5a0b91 100644 --- a/src/raster_colorizer.cpp +++ b/src/raster_colorizer.cpp @@ -286,13 +286,13 @@ unsigned raster_colorizer::get_color(float value) const } -template void raster_colorizer::colorize(image_rgba8 & out, image_data_gray8 const& in, +template void raster_colorizer::colorize(image_rgba8 & out, image_gray8 const& in, boost::optionalconst& nodata, feature_impl const& f) const; -template void raster_colorizer::colorize(image_rgba8 & out, image_data_gray16 const& in, +template void raster_colorizer::colorize(image_rgba8 & out, image_gray16 const& in, boost::optionalconst& nodata, feature_impl const& f) const; -template void raster_colorizer::colorize(image_rgba8 & out, image_data_gray32f const& in, +template void raster_colorizer::colorize(image_rgba8 & out, image_gray32f const& in, boost::optionalconst& nodata, feature_impl const& f) const; diff --git a/src/renderer_common/process_group_symbolizer.cpp b/src/renderer_common/process_group_symbolizer.cpp index c41abba7c..2c19d63f7 100644 --- a/src/renderer_common/process_group_symbolizer.cpp +++ b/src/renderer_common/process_group_symbolizer.cpp @@ -50,7 +50,7 @@ raster_marker_render_thunk::raster_marker_render_thunk(image_rgba8 {} template <> -raster_marker_render_thunk::raster_marker_render_thunk(image_data_gray8 & src, +raster_marker_render_thunk::raster_marker_render_thunk(image_gray8 & src, agg::trans_affine const& marker_trans, double opacity, composite_mode_e comp_op, @@ -60,7 +60,7 @@ raster_marker_render_thunk::raster_marker_render_thunk(image_d {} template <> -raster_marker_render_thunk::raster_marker_render_thunk(image_data_gray16 & src, +raster_marker_render_thunk::raster_marker_render_thunk(image_gray16 & src, agg::trans_affine const& marker_trans, double opacity, composite_mode_e comp_op, @@ -70,7 +70,7 @@ raster_marker_render_thunk::raster_marker_render_thunk(image_ {} template <> -raster_marker_render_thunk::raster_marker_render_thunk(image_data_gray32f & src, +raster_marker_render_thunk::raster_marker_render_thunk(image_gray32f & src, agg::trans_affine const& marker_trans, double opacity, composite_mode_e comp_op, diff --git a/src/renderer_common/render_pattern.cpp b/src/renderer_common/render_pattern.cpp index 4263882d9..6ad5e7ca4 100644 --- a/src/renderer_common/render_pattern.cpp +++ b/src/renderer_common/render_pattern.cpp @@ -81,7 +81,7 @@ std::shared_ptr render_pattern(rasterizer & ra } /* template <> -std::shared_ptr render_pattern(rasterizer & ras, +std::shared_ptr render_pattern(rasterizer & ras, marker const& marker, agg::trans_affine const& tr, double opacity) @@ -97,7 +97,7 @@ std::shared_ptr render_pattern(rasterizer & mtx.translate(0.5 * bbox.width(), 0.5 * bbox.height()); mtx = tr * mtx; - std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); + std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); agg::rendering_buffer buf(image->getBytes(), image->width(), image->height(), image->width()); pixfmt pixf(buf); renderer_base renb(pixf); @@ -115,7 +115,7 @@ std::shared_ptr render_pattern(rasterizer & } template <> -std::shared_ptr render_pattern(rasterizer & ras, +std::shared_ptr render_pattern(rasterizer & ras, marker const& marker, agg::trans_affine const& tr, double opacity) @@ -131,7 +131,7 @@ std::shared_ptr render_pattern(rasterizer mtx.translate(0.5 * bbox.width(), 0.5 * bbox.height()); mtx = tr * mtx; - std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); + std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); agg::rendering_buffer buf(image->getBytes(), image->width(), image->height(), image->width() * 2); pixfmt pixf(buf); renderer_base renb(pixf); @@ -149,7 +149,7 @@ std::shared_ptr render_pattern(rasterizer } template <> -std::shared_ptr render_pattern(rasterizer & ras, +std::shared_ptr render_pattern(rasterizer & ras, marker const& marker, agg::trans_affine const& tr, double opacity) @@ -165,7 +165,7 @@ std::shared_ptr render_pattern(rasterize mtx.translate(0.5 * bbox.width(), 0.5 * bbox.height()); mtx = tr * mtx; - std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); + std::shared_ptr image = std::make_shared(bbox.width(), bbox.height()); agg::rendering_buffer buf(image->getBytes(), image->width(), image->height(), image->width() * 4); pixfmt pixf(buf); renderer_base renb(pixf); diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp index eefc1d98b..a3dade629 100644 --- a/src/tiff_reader.cpp +++ b/src/tiff_reader.cpp @@ -495,15 +495,15 @@ image_any tiff_reader::read(unsigned x0, unsigned y0, unsigned width, unsigne { case 8: { - return read_any_gray(x0, y0, width, height); + return read_any_gray(x0, y0, width, height); } case 16: { - return read_any_gray(x0, y0, width, height); + return read_any_gray(x0, y0, width, height); } case 32: { - return read_any_gray(x0, y0, width, height); + return read_any_gray(x0, y0, width, height); } } } diff --git a/src/warp.cpp b/src/warp.cpp index 431263c17..a6a350685 100644 --- a/src/warp.cpp +++ b/src/warp.cpp @@ -213,13 +213,13 @@ void reproject_and_scale_raster(raster & target, raster const& source, template MAPNIK_DECL void warp_image (image_rgba8&, image_rgba8 const&, proj_transform const&, box2d const&, box2d const&, double, double, unsigned, scaling_method_e, double); -template MAPNIK_DECL void warp_image (image_data_gray8&, image_data_gray8 const&, proj_transform const&, +template MAPNIK_DECL void warp_image (image_gray8&, image_gray8 const&, proj_transform const&, box2d const&, box2d const&, double, double, unsigned, scaling_method_e, double); -template MAPNIK_DECL void warp_image (image_data_gray16&, image_data_gray16 const&, proj_transform const&, +template MAPNIK_DECL void warp_image (image_gray16&, image_gray16 const&, proj_transform const&, box2d const&, box2d const&, double, double, unsigned, scaling_method_e, double); -template MAPNIK_DECL void warp_image (image_data_gray32f&, image_data_gray32f const&, proj_transform const&, +template MAPNIK_DECL void warp_image (image_gray32f&, image_gray32f const&, proj_transform const&, box2d const&, box2d const&, double, double, unsigned, scaling_method_e, double); diff --git a/tests/cxx/tiff_io.cpp b/tests/cxx/tiff_io.cpp index 1a352aae0..da3b6c073 100644 --- a/tests/cxx/tiff_io.cpp +++ b/tests/cxx/tiff_io.cpp @@ -185,7 +185,7 @@ SECTION("gray8 striped") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_NONE ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL @@ -201,7 +201,7 @@ SECTION("gray8 tiled") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_LZW ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL @@ -217,7 +217,7 @@ SECTION("gray16 striped") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_NONE ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL @@ -233,7 +233,7 @@ SECTION("gray16 tiled") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_LZW ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL @@ -249,7 +249,7 @@ SECTION("gray32f striped") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_NONE ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL @@ -265,7 +265,7 @@ SECTION("gray32f tiled") { REQUIRE( tiff_reader.photometric() == PHOTOMETRIC_MINISBLACK ); REQUIRE( tiff_reader.compression() == COMPRESSION_LZW ); mapnik::image_any data = reader->read(0, 0, reader->width(), reader->height()); - REQUIRE( data.is() == true ); + REQUIRE( data.is() == true ); TIFF_ASSERT_SIZE( data,reader ); TIFF_ASSERT_NO_ALPHA( data ); TIFF_READ_ONE_PIXEL