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

Switch ASSERT macros to new stream API (#7881)

Browse Source
This commit is contained in:
Ben Doherty
2024-05-24 13:46:34 -07:00
committed by GitHub
parent 3ec2249b2a
commit cf91e42847
77 changed files with 854 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libs/image/src/ImageOps.cpp
View File

@@ -34,7 +34,7 @@ LinearImage horizontalStack(std::initializer_list<LinearImage> images) {
}
LinearImage horizontalStack(const LinearImage* first, size_t count) {
ASSERT_PRECONDITION(count > 0, "Must supply one or more images for stacking.");
FILAMENT_CHECK_PRECONDITION(count > 0) << "Must supply one or more images for stacking.";
// Compute the final size and allocate memory.
uint32_t width = 0;
@@ -46,12 +46,12 @@ LinearImage horizontalStack(const LinearImage* first, size_t count) {
if (height == 0) {
height = img.getHeight();
} else {
ASSERT_PRECONDITION(height == img.getHeight(), "Inconsistent heights.");
FILAMENT_CHECK_PRECONDITION(height == img.getHeight()) << "Inconsistent heights.";
}
if (nchannels == 0) {
nchannels = img.getChannels();
} else {
ASSERT_PRECONDITION(nchannels == img.getChannels(), "Inconsistent channels.");
FILAMENT_CHECK_PRECONDITION(nchannels == img.getChannels()) << "Inconsistent channels.";
}
}
LinearImage result(width, height, nchannels);
@@ -79,7 +79,7 @@ LinearImage verticalStack(std::initializer_list<LinearImage> images) {
// result. This is incredibly lazy, but since we use row-major ordering, copying columns would be
// really painful.
LinearImage verticalStack(const LinearImage* first, size_t count) {
ASSERT_PRECONDITION(count > 0, "Must supply one or more images for stacking.");
FILAMENT_CHECK_PRECONDITION(count > 0) << "Must supply one or more images for stacking.";
std::unique_ptr<LinearImage[]> flipped(new LinearImage[count]);
int i = 0;
for (size_t c = 0; c < count; ++c) {
@@ -133,16 +133,16 @@ LinearImage applyScaleOffset(const LinearImage& image,
}
LinearImage vectorsToColors(const LinearImage& image) {
ASSERT_PRECONDITION(image.getChannels() == 3 || image.getChannels() == 4,
"Must be a 3 or 4 channel image");
FILAMENT_CHECK_PRECONDITION(image.getChannels() == 3 || image.getChannels() == 4)
<< "Must be a 3 or 4 channel image";
return image.getChannels() == 3
? applyScaleOffset<float3>(image, 0.5f, 0.5f)
: applyScaleOffset<float4>(image, 0.5f, 0.5f);
}
LinearImage colorsToVectors(const LinearImage& image) {
ASSERT_PRECONDITION(image.getChannels() == 3 || image.getChannels() == 4,
"Must be a 3 or 4 channel image");
FILAMENT_CHECK_PRECONDITION(image.getChannels() == 3 || image.getChannels() == 4)
<< "Must be a 3 or 4 channel image";
return image.getChannels() == 3
? applyScaleOffset<float3>(image, 2.0f, -1.0f)
: applyScaleOffset<float4>(image, 2.0f, -1.0f);
@@ -151,7 +151,7 @@ LinearImage colorsToVectors(const LinearImage& image) {
LinearImage extractChannel(const LinearImage& source, uint32_t channel) {
const uint32_t width = source.getWidth(), height = source.getHeight();
const uint32_t nchan = source.getChannels();
ASSERT_PRECONDITION(channel < nchan, "Channel is out of range.");
FILAMENT_CHECK_PRECONDITION(channel < nchan) << "Channel is out of range.";
LinearImage result(width, height, 1);
auto src = source.getPixelRef();
auto dst = result.getPixelRef();
@@ -167,14 +167,16 @@ LinearImage combineChannels(std::initializer_list<LinearImage> images) {
}
LinearImage combineChannels(LinearImage const* img, size_t count) {
ASSERT_PRECONDITION(count > 0, "Must supply one or more image planes for combining.");
FILAMENT_CHECK_PRECONDITION(count > 0) << "Must supply one or more image planes for combining.";
const uint32_t width = img[0].getWidth();
const uint32_t height = img[0].getHeight();
for (size_t c = 0; c < count; ++c) {
const LinearImage& plane = img[c];
ASSERT_PRECONDITION(plane.getWidth() == width, "Planes must all have same width.");
ASSERT_PRECONDITION(plane.getHeight() == height, "Planes must all have same height.");
ASSERT_PRECONDITION(plane.getChannels() == 1, "Planes must be single channel.");
FILAMENT_CHECK_PRECONDITION(plane.getWidth() == width)
<< "Planes must all have same width.";
FILAMENT_CHECK_PRECONDITION(plane.getHeight() == height)
<< "Planes must all have same height.";
FILAMENT_CHECK_PRECONDITION(plane.getChannels() == 1) << "Planes must be single channel.";
}
LinearImage result(width, height, (uint32_t) count);
float* dst = result.getPixelRef();
@@ -414,10 +416,12 @@ LinearImage voronoiFromCoordField(const LinearImage& coordField, const LinearIma
}
void blitImage(LinearImage& target, const LinearImage& source) {
ASSERT_PRECONDITION(source.getWidth() == target.getWidth(), "Images must have same width.");
ASSERT_PRECONDITION(source.getHeight() == target.getHeight(), "Images must have same height.");
ASSERT_PRECONDITION(source.getChannels() == target.getChannels(),
"Images must have same number of channels.");
FILAMENT_CHECK_PRECONDITION(source.getWidth() == target.getWidth())
<< "Images must have same width.";
FILAMENT_CHECK_PRECONDITION(source.getHeight() == target.getHeight())
<< "Images must have same height.";
FILAMENT_CHECK_PRECONDITION(source.getChannels() == target.getChannels())
<< "Images must have same number of channels.";
memcpy(target.getPixelRef(), source.getPixelRef(),
sizeof(float) * source.getWidth() * source.getHeight() * source.getChannels());
}