amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert combine_blend changes

Browse Source
This commit is contained in:
GenevensiS
2024-09-22 16:51:23 +02:00
parent fa021d81c8
commit 59a184e2b2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gfx/combine_image.cpp
+9 -10
View File
@@ -295,24 +295,23 @@ COMBINE_FUN(COMBINE_SMALLER_THAN_250, a < 250 ? b : a)
/// The results are stored in the image A. /// The results are stored in the image A.
template <ImageCombine combine> template <ImageCombine combine>
void combine_image_do(Image& a, Image b) { void combine_image_do(Image& a, Image b) {
UInt size = a.GetWidth() * a.GetHeight(); UInt size = a.GetWidth() * a.GetHeight() * 3;
Byte *dataA = a.GetData(), *dataB = b.GetData(); Byte* dataA = a.GetData(), * dataB = b.GetData();
// for each pixel: apply function // for each pixel: apply function
for (UInt i = 0 ; i < (size * 3); ++i) { for (UInt i = 0; i < size; ++i) {
dataA[i] = Combine<combine>::f(dataA[i], dataB[i]); dataA[i] = Combine<combine>::f(dataA[i], dataB[i]);
}
if (a.HasAlpha() && b.HasAlpha()) {
Byte* alphaA = a.GetAlpha(), * alphaB = b.GetAlpha();
for (UInt i = 0; i < size; ++i) {
alphaA[i] = Combine<combine>::f(alphaA[i], alphaB[i]);
}
} }
} }
void combine_image(Image& a, const Image& b, ImageCombine combine) { void combine_image(Image& a, const Image& b, ImageCombine combine) {
// Images must have same size // Images must have same size
if (a.GetWidth() != b.GetWidth() || a.GetHeight() != b.GetHeight()) { if (a.GetWidth() != b.GetWidth() || a.GetHeight() != b.GetHeight()) {
throw Error(_ERROR_("images used for combine blending must have the same size")); throw Error(_ERROR_("images used for combine blending must have the same size"));
}
// Copy alpha channel?
if (b.HasAlpha()) {
if (!a.HasAlpha()) a.InitAlpha();
memcpy(a.GetAlpha(), b.GetAlpha(), a.GetWidth() * a.GetHeight());
} }
// Combine image data, by dispatching to combineImageDo // Combine image data, by dispatching to combineImageDo
switch(combine) { switch(combine) {