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

move is_solid to hpp for now to avoid linking errors

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-14 21:20:15 -08:00
parent d0d899a9dd
commit 508521d5e5
2 changed files with 51 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
include/mapnik/image_util.hpp
View file

@ -27,6 +27,7 @@
#include <mapnik/config.hpp>
#include <mapnik/image_data.hpp>
#include <mapnik/image_view.hpp>
#include <mapnik/util/variant.hpp>
// boost
#pragma GCC diagnostic push
@ -109,8 +110,57 @@ MAPNIK_DECL void save_to_stream
std::string const& type
);
namespace detail {
struct is_solid_visitor
{
template <typename T>
inline bool operator() (T const & data)
{
using pixel_type = typename T::pixel_type;
if (data.width() > 0 && data.height() > 0)
{
pixel_type const* first_row = data.getRow(0);
pixel_type const first_pixel = first_row[0];
for (unsigned y = 0; y < data.height(); ++y)
{
pixel_type const * row = data.getRow(y);
for (unsigned x = 0; x < data.width(); ++x)
{
if (first_pixel != row[x])
{
return false;
}
}
}
}
return true;
}
};
}
template <typename T>
MAPNIK_DECL bool is_solid (T const& image);
inline bool is_solid (T const& image)
{
return util::apply_visitor(detail::is_solid_visitor(), image);
}
// Temporary until image_data_rgba8 is removed from passing
template <>
inline bool is_solid<image_data_rgba8>(image_data_rgba8 const& image)
{
detail::is_solid_visitor visitor;
return visitor(image);
}
// Temporary until image_view_rgba8 is removed from passing
template <>
inline bool is_solid<image_view_rgba8>(image_view_rgba8 const& image)
{
detail::is_solid_visitor visitor;
return visitor(image);
}
inline bool is_png(std::string const& filename)
{

61
src/image_util.cpp
View file

@ -182,67 +182,6 @@ void save_to_file(T const& image, std::string const& filename, rgba_palette cons
else throw ImageWriterException("Could not write file to " + filename );
}
namespace detail {
struct is_solid_visitor
{
template <typename T>
bool operator() (T const & data)
{
using pixel_type = typename T::pixel_type;
if (data.width() > 0 && data.height() > 0)
{
pixel_type const* first_row = data.getRow(0);
pixel_type const first_pixel = first_row[0];
for (unsigned y = 0; y < data.height(); ++y)
{
pixel_type const * row = data.getRow(y);
for (unsigned x = 0; x < data.width(); ++x)
{
if (first_pixel != row[x])
{
return false;
}
}
}
}
return true;
}
};
template bool is_solid_visitor::operator()<image_data_rgba8> (image_data_rgba8 const& data);
template bool is_solid_visitor::operator()<image_data_gray8> (image_data_gray8 const& data);
template bool is_solid_visitor::operator()<image_data_gray16> (image_data_gray16 const& data);
template bool is_solid_visitor::operator()<image_data_gray32f> (image_data_gray32f const& data);
template bool is_solid_visitor::operator()<image_view_rgba8> (image_view_rgba8 const& data);
template bool is_solid_visitor::operator()<image_view_gray8> (image_view_gray8 const& data);
template bool is_solid_visitor::operator()<image_view_gray16> (image_view_gray16 const& data);
template bool is_solid_visitor::operator()<image_view_gray32f> (image_view_gray32f const& data);
} // end detail ns
template <typename T>
bool is_solid(T const& image)
{
return util::apply_visitor(detail::is_solid_visitor(), image);
}
// Temporary until image_data_rgba8 is removed from passing
template <>
bool is_solid<image_data_rgba8>(image_data_rgba8 const& image)
{
detail::is_solid_visitor visitor;
return visitor(image);
}
// Temporary until image_view_rgba8 is removed from passing
template <>
bool is_solid<image_view_rgba8>(image_view_rgba8 const& image)
{
detail::is_solid_visitor visitor;
return visitor(image);
}
template void save_to_file<image_data_rgba8>(image_data_rgba8 const&,
std::string const&,
std::string const&);