[Bf-blender-cvs] [1b52be98934] temp-gpu-image-engine: Fix compile errors on windows.
Jeroen Bakker
noreply at git.blender.org
Wed Dec 15 14:37:52 CET 2021
Commit: 1b52be98934f714ca2610856bdad3876304b962c
Author: Jeroen Bakker
Date: Wed Dec 15 11:51:03 2021 +0100
Branches: temp-gpu-image-engine
https://developer.blender.org/rB1b52be98934f714ca2610856bdad3876304b962c
Fix compile errors on windows.
===================================================================
M source/blender/imbuf/intern/transform.cc
===================================================================
diff --git a/source/blender/imbuf/intern/transform.cc b/source/blender/imbuf/intern/transform.cc
index b91ed90576e..82c8747d28d 100644
--- a/source/blender/imbuf/intern/transform.cc
+++ b/source/blender/imbuf/intern/transform.cc
@@ -310,20 +310,20 @@ class Sampler {
if constexpr (Filter == IMB_FILTER_BILINEAR && std::is_same_v<StorageType, float> &&
NumChannels == 4) {
- bilinear_interpolation_color_fl(source, nullptr, r_sample.begin(), wrapped_u, wrapped_v);
+ bilinear_interpolation_color_fl(source, nullptr, &r_sample[0], wrapped_u, wrapped_v);
}
else if constexpr (Filter == IMB_FILTER_NEAREST &&
std::is_same_v<StorageType, unsigned char> && NumChannels == 4) {
- nearest_interpolation_color_char(source, r_sample.begin(), nullptr, wrapped_u, wrapped_v);
+ nearest_interpolation_color_char(source, &r_sample[0], nullptr, wrapped_u, wrapped_v);
}
else if constexpr (Filter == IMB_FILTER_BILINEAR &&
std::is_same_v<StorageType, unsigned char> && NumChannels == 4) {
- bilinear_interpolation_color_char(source, r_sample.begin(), nullptr, wrapped_u, wrapped_v);
+ bilinear_interpolation_color_char(source, &r_sample[0], nullptr, wrapped_u, wrapped_v);
}
else if constexpr (Filter == IMB_FILTER_BILINEAR && std::is_same_v<StorageType, float>) {
if constexpr (std::is_same_v<UVWrapping, WrapRepeatUV>) {
BLI_bilinear_interpolation_wrap_fl(source->rect_float,
- r_sample.begin(),
+ &r_sample[0],
source->x,
source->y,
NumChannels,
@@ -334,7 +334,7 @@ class Sampler {
}
else {
BLI_bilinear_interpolation_fl(source->rect_float,
- r_sample.begin(),
+ &r_sample[0],
source->x,
source->y,
NumChannels,
@@ -406,11 +406,11 @@ class ChannelConverter {
BLI_STATIC_ASSERT(SourceNumChannels == 4, "Unsigned chars always have 4 channels.");
BLI_STATIC_ASSERT(DestinationNumChannels == 4, "Unsigned chars always have 4 channels.");
- copy_v4_v4_uchar(pixel_pointer.get_pointer(), sample.begin());
+ copy_v4_v4_uchar(pixel_pointer.get_pointer(), &sample[0]);
}
else if constexpr (std::is_same_v<StorageType, float> && SourceNumChannels == 4 &&
DestinationNumChannels == 4) {
- copy_v4_v4(pixel_pointer.get_pointer(), sample.begin());
+ copy_v4_v4(pixel_pointer.get_pointer(), &sample[0]);
}
else if constexpr (std::is_same_v<StorageType, float> && SourceNumChannels == 3 &&
DestinationNumChannels == 4) {
More information about the Bf-blender-cvs
mailing list