Signed conversion checkpoint

This commit is contained in:
Ian Gulliver
2017-08-12 07:38:18 -07:00
parent e87b9b8cab
commit 566c60d91a
6 changed files with 46 additions and 39 deletions

25
color.h
View File

@@ -7,28 +7,30 @@
#include "intmath.h"
constexpr uint32_t kMaxColor = UINT16_MAX;
constexpr int32_t kMinColor = 0;
constexpr int32_t kMaxColor = UINT16_MAX;
// 32-bit for compiler convenience, but values are 16-bit
template <uint32_t C>
struct Color : public std::array<uint32_t, C> {
constexpr uint32_t Difference(const Color<C>& other) const;
constexpr Color<C> Interpolate(const Color<C>& other, uint32_t mul, uint32_t div) const;
struct Color : public std::array<int32_t, C> {
constexpr uint32_t AbsDiff(const Color<C>& other) const;
constexpr Color<C> Interpolate(const Color<C>& other, int32_t mul, int32_t div) const;
constexpr Color<C> Crop() const;
};
struct RgbColor : public Color<3> {};
template <uint32_t C>
constexpr uint32_t Color<C>::Difference(const Color<C>& other) const {
constexpr uint32_t Color<C>::AbsDiff(const Color<C>& other) const {
uint32_t diff = 0;
for (uint32_t c = 0; c < C; ++c) {
diff += AbsDiff(this->at(c), other.at(c));
diff += static_cast<uint32_t>(::AbsDiff(this->at(c), other.at(c)));
}
return diff;
}
template <uint32_t C>
constexpr Color<C> Color<C>::Interpolate(const Color<C>& other, uint32_t mul, uint32_t div) const {
constexpr Color<C> Color<C>::Interpolate(const Color<C>& other, int32_t mul, int32_t div) const {
Color<C> ret;
for (uint32_t c = 0; c < C; ++c) {
ret.at(c) = ::Interpolate(this->at(c), other.at(c), mul, div);
@@ -36,6 +38,15 @@ constexpr Color<C> Color<C>::Interpolate(const Color<C>& other, uint32_t mul, ui
return ret;
}
template <uint32_t C>
constexpr Color<C> Color<C>::Crop() const {
Color<C> ret;
for (uint32_t c = 0; c < C; ++c) {
ret.at(c) = std::max(kMinColor, std::min(kMaxColor, this->at(c)));
}
return ret;
}
template <uint32_t C>
std::ostream& operator<<(std::ostream& os, const Color<C>& color) {
os << std::hex << std::setfill('0') << "Color(";