archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: move unit char/short/float to functions

Browse Source 
This caused GCC 8.1 to crash at build time,
but was also not very nice use of macros.
This commit is contained in:
Campbell Barton
2018-05-07 17:14:28 +02:00
parent 66ec3c7e7f
commit 905eeb0bc7
8 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/imbuf/intern/scaling.c
View File

@@ -332,9 +332,9 @@ MINLINE void premul_ushort_to_straight_uchar(unsigned char *result, const unsign
else {
unsigned short alpha = color[3] / 256;
result[0] = USHORTTOUCHAR(color[0] / alpha * 256);
result[1] = USHORTTOUCHAR(color[1] / alpha * 256);
result[2] = USHORTTOUCHAR(color[2] / alpha * 256);
result[0] = USHORTTOUCHAR((ushort)(color[0] / alpha * 256));
result[1] = USHORTTOUCHAR((ushort)(color[1] / alpha * 256));
result[2] = USHORTTOUCHAR((ushort)(color[2] / alpha * 256));
result[3] = USHORTTOUCHAR(color[3]);
}
}