RPJosh
/
neatvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixels: Make it work for 4 bytes per cpixel

pull/13/head
Andri Yngvason 2020-01-19 21:30:49 +00:00
parent 7fa074e60b
commit aa917decf3
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pixels.c
View File

@ -47,10 +47,6 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
uint32_t src_green_max = src_fmt->green_max; uint32_t src_green_max = src_fmt->green_max;
uint32_t src_blue_max = src_fmt->blue_max; uint32_t src_blue_max = src_fmt->blue_max;
uint32_t dst_red_max = dst_fmt->red_max;
uint32_t dst_green_max = dst_fmt->green_max;
uint32_t dst_blue_max = dst_fmt->blue_max;
uint32_t src_red_bits = POPCOUNT(src_fmt->red_max); uint32_t src_red_bits = POPCOUNT(src_fmt->red_max);
uint32_t src_green_bits = POPCOUNT(src_fmt->green_max); uint32_t src_green_bits = POPCOUNT(src_fmt->green_max);
uint32_t src_blue_bits = POPCOUNT(src_fmt->blue_max); uint32_t src_blue_bits = POPCOUNT(src_fmt->blue_max);
@ -74,6 +70,31 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
} }
switch (bytes_per_cpixel) { switch (bytes_per_cpixel) {
case 4:
if (dst_fmt->big_endian_flag) {
while (len--) {
uint32_t cpx, px = *src++;
CONVERT_PIXELS(cpx, px)
*dst++ = (cpx >> 24) & 0xff;
*dst++ = (cpx >> 16) & 0xff;
*dst++ = (cpx >> 8) & 0xff;
*dst++ = (cpx >> 0) & 0xff;
}
} else {
while (len--) {
uint32_t cpx, px = *src++;
CONVERT_PIXELS(cpx, px)
*dst++ = (cpx >> 0) & 0xff;
*dst++ = (cpx >> 8) & 0xff;
*dst++ = (cpx >> 16) & 0xff;
*dst++ = (cpx >> 24) & 0xff;
}
}
break;
case 3: case 3:
if (dst_fmt->bits_per_pixel == 32 && dst_fmt->depth <= 24) { if (dst_fmt->bits_per_pixel == 32 && dst_fmt->depth <= 24) {
uint32_t min_dst_shift = dst_red_shift; uint32_t min_dst_shift = dst_red_shift;
@ -87,8 +108,6 @@ void pixel32_to_cpixel(uint8_t* restrict dst,
dst_blue_shift -= min_dst_shift; dst_blue_shift -= min_dst_shift;
} }
/* fallthrough */
case 4:
dst_endian_correction = dst_fmt->big_endian_flag ? 16 : 0; dst_endian_correction = dst_fmt->big_endian_flag ? 16 : 0;
while (len--) { while (len--) {