blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix missing code-paths in previous sequence/imbuf commits.

This commit is contained in:
Jeroen Bakker 2023-01-26 15:15:21 +01:00
parent 3b17d6c619
commit c412c38f0d
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/imbuf/intern/transform.cc
View File

@ -474,6 +474,11 @@ class ChannelConverter {
blend_color_interpolate_byte(
pixel_pointer.get_pointer(), pixel_pointer.get_pointer(), sample.data(), mix_factor);
}
else if constexpr (std::is_same_v<StorageType, float> && SourceNumChannels == 4 &&
DestinationNumChannels == 4) {
blend_color_interpolate_float(
pixel_pointer.get_pointer(), pixel_pointer.get_pointer(), sample.data(), mix_factor);
}
else {
BLI_assert_unreachable();
}
@ -547,20 +552,12 @@ class ScanlineProcessor {
xi += 1;
}
/*
* Draw until we didn't draw for at least 4 pixels.
*/
int num_output_pixels_skipped = 0;
const int num_missing_output_pixels_allowed = 4;
for (; xi < width && num_output_pixels_skipped < num_missing_output_pixels_allowed; xi++) {
for (; xi < width; xi++) {
if (!discarder.should_discard(*user_data, uv)) {
typename Sampler::SampleType sample;
sampler.sample(user_data->src, uv, sample);
channel_converter.convert_and_store(sample, output);
}
else {
num_output_pixels_skipped += 1;
}
uv += user_data->add_x;
output.increase_pixel_pointer();
@ -593,12 +590,7 @@ class ScanlineProcessor {
xi += 1;
}
/*
* Draw until we didn't draw for at least 4 pixels.
*/
int num_output_pixels_skipped = 0;
const int num_missing_output_pixels_allowed = 4;
for (; xi < width && num_output_pixels_skipped < num_missing_output_pixels_allowed; xi++) {
for (; xi < width; xi++) {
typename Sampler::SampleType sample;
sample.clear();
int num_subsamples_added = 0;
@ -625,9 +617,6 @@ class ScanlineProcessor {
(user_data->subsampling.num * user_data->subsampling.num);
channel_converter.mix_and_store(sample, output, mix_weight);
}
else {
num_output_pixels_skipped += 1;
}
uv += user_data->add_x;
output.increase_pixel_pointer();
}