Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor color space utilities. (#58)

Browse Source 
* Refactor color space utilities.

* Repair Android build.
This commit is contained in:
Philip Rideout
2018-08-09 13:58:58 -07:00
committed by GitHub
parent 714e0c18e0
commit 9ed20705ec
9 changed files with 259 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libs/imageio/src/ImageEncoder.cpp
View File

@@ -18,6 +18,7 @@
#include <algorithm>
#include <cstdint>
#include <cstring> // for memset
#include <functional>
#include <limits>
#include <memory>
@@ -38,7 +39,7 @@
#include <math/vec3.h>
#include <math/vec4.h>
#include <image/utilities.h>
#include <image/ColorSpace.h>
using namespace math;
@@ -260,62 +261,6 @@ std::string ImageEncoder::chooseExtension(ImageEncoder::Format format) {
}
}
template <typename T>
std::unique_ptr<uint8_t[]> fromLinearTosRGB(const Image& image) {
size_t w = image.getWidth();
size_t h = image.getHeight();
size_t channels = image.getChannelsCount();
std::unique_ptr<uint8_t[]> dst(new uint8_t[w * h * 3 * sizeof(T)]);
T* d = reinterpret_cast<T*>(dst.get());
for (size_t y = 0; y < h; ++y) {
float3 const* p = static_cast<float3 const*>(image.getPixelRef(0, y));
for (size_t x = 0; x < w; ++x, ++p, d += channels) {
float3 l(linearTosRGB(saturate(*p)) * std::numeric_limits<T>::max());
for (size_t i = 0; i < 3; i++) {
d[i] = T(l[i]);
}
}
}
return dst;
}
template <typename T>
std::unique_ptr<uint8_t[]> fromLinearToRGB(const Image& image) {
size_t w = image.getWidth();
size_t h = image.getHeight();
size_t channels = image.getChannelsCount();
std::unique_ptr<uint8_t[]> dst(new uint8_t[w * h * channels * sizeof(T)]);
T* d = reinterpret_cast<T*>(dst.get());
for (size_t y = 0; y < h; ++y) {
float3 const* p = static_cast<float3 const*>(image.getPixelRef(0, y));
for (size_t x = 0; x < w; ++x, ++p, d += channels) {
float3 l(saturate(*p) * std::numeric_limits<T>::max());
for (size_t i = 0; i < channels; i++) {
d[i] = T(l[i]);
}
}
}
return dst;
}
template <typename T>
std::unique_ptr<uint8_t[]> fromLinearToRGBM(const Image& image) {
size_t w = image.getWidth();
size_t h = image.getHeight();
std::unique_ptr<uint8_t[]> dst(new uint8_t[w * h * 4 * sizeof(T)]);
T* d = reinterpret_cast<T*>(dst.get());
for (size_t y = 0; y < h; ++y) {
float3 const* p = static_cast<float3 const*>(image.getPixelRef(0, y));
for (size_t x = 0; x < w; ++x, ++p, d += 4) {
float4 l(linearToRGBM(*p) * std::numeric_limits<T>::max());
for (size_t i = 0; i < 4; i++) {
d[i] = T(l[i]);
}
}
}
return dst;
}
//-------------------------------------------------------------------------------------------------
PNGEncoder* PNGEncoder::create(std::ostream& stream, PixelFormat format) {