sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

raster_colorizer - template colorize method on image_data type

Browse source
This commit is contained in:
artemp 2014-12-11 10:10:32 +01:00
parent dd22d34d07
commit f921e1eef4
2 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/mapnik/raster_colorizer.hpp
View file

@ -197,14 +197,8 @@ public:
//! \return The list of stops
colorizer_stops const& get_stops() const { return stops_; }
//! \brief Colorize a raster
//!
//! \param[in, out] raster A raster stored in float32 single channel format, which gets colorized in place.
void colorize(raster & ras, feature_impl const& f) const;
//
void colorize(image_data_rgba8 & out, image_data_gray16 const& in, boost::optional<double>const& nodata, feature_impl const& f) const;
template <typename T>
void colorize(image_data_rgba8 & out, T const& in, boost::optional<double>const& nodata, feature_impl const& f) const;
//! \brief Perform the translation of input to output
//!

42
src/raster_colorizer.cpp
View file

@ -122,36 +122,20 @@ bool raster_colorizer::add_stop(colorizer_stop const& stop)
return true;
}
void raster_colorizer::colorize(raster & ras, feature_impl const& f) const
{
std::int16_t * imageData = reinterpret_cast<std::int16_t*>(ras.data_.getBytes());
int len = ras.data_.width() * ras.data_.height();
boost::optional<double> const& nodata = ras.nodata();
for (int i=0; i<len; ++i)
{
// the GDAL plugin reads single bands as floats
std::int16_t value = imageData[i];
if (nodata && (std::fabs(value - *nodata) < epsilon_))
{
imageData[i] = 0;
}
else
{
imageData[i] = get_color(value);
}
}
}
void raster_colorizer::colorize(image_data_rgba8 & out, image_data_gray16 const& in, boost::optional<double>const& nodata, feature_impl const& f) const
template <typename T>
void raster_colorizer::colorize(image_data_rgba8 & out, T const& in,
boost::optional<double>const& nodata,
feature_impl const& f) const
{
using image_data_type = T;
using pixel_type = typename image_data_type::pixel_type;
// TODO: assuming in/out have the same width/height for now
std::uint32_t * out_data = out.getData();
std::int16_t const* in_data = in.getData();
pixel_type const* in_data = in.getData();
int len = out.width() * out.height();
for (int i=0; i<len; ++i)
{
// the GDAL plugin reads single bands as floats
std::int16_t value = in_data[i];
pixel_type value = in_data[i];
if (nodata && (std::fabs(value - *nodata) < epsilon_))
{
out_data[i] = 0; // rgba(0,0,0,0)
@ -302,4 +286,14 @@ unsigned raster_colorizer::get_color(float value) const
}
template void raster_colorizer::colorize(image_data_rgba8 & out, image_data_gray8 const& in,
boost::optional<double>const& nodata,
feature_impl const& f) const;
template void raster_colorizer::colorize(image_data_rgba8 & out, image_data_gray16 const& in,
boost::optional<double>const& nodata,
feature_impl const& f) const;
template void raster_colorizer::colorize(image_data_rgba8 & out, image_data_gray32f const& in,
boost::optional<double>const& nodata,
feature_impl const& f) const;
}