Merge 'master' branch

This commit is contained in:
David Capello 2016-06-02 13:05:53 -03:00
commit b4588d34f4

View File

@ -23,6 +23,7 @@ template<typename ImageTraits>
bool is_same_pixel(color_t pixel1, color_t pixel2)
{
static_assert(false && sizeof(ImageTraits), "No is_same_pixel impl");
return false;
}
template<>