mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix padding and initial offset when pasting 16bpp images from Windows clipboard

Browse Source 
Related to #759
This commit is contained in:
David Capello 2015-08-20 12:45:54 -03:00
parent 0d5ba77ba4
commit 3326c94aec
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/util/clipboard_win32.h
View File

@ -335,18 +335,24 @@ static void get_win32_clipboard_bitmap(Image*& image, Mask*& mask, Palette*& pal
// 16 BPP
case 16: {
uint8_t* src = (((uint8_t*)bi)+bi->bmiHeader.biSize);
uint8_t r, g, b;
uint16_t* src = (uint16_t*)(((uint8_t*)bi)+bi->bmiHeader.biSize+sizeof(RGBQUAD)*3);
uint16_t word;
int padding = (4-((image->width()*2)&3))&3;
uint8_t r, g, b;
int padding = ((4-((image->width()*2)&3))&3)/2;
uint32_t r_mask = (uint32_t)*((uint32_t*)&bi->bmiColors[0]);
uint32_t g_mask = (uint32_t)*((uint32_t*)&bi->bmiColors[1]);
uint32_t b_mask = (uint32_t)*((uint32_t*)&bi->bmiColors[2]);
uint32_t r_shift = get_shift_from_mask(r_mask);
uint32_t g_shift = get_shift_from_mask(g_mask);
uint32_t b_shift = get_shift_from_mask(b_mask);
for (int y=image->height()-1; y>=0; --y) {
for (int x=0; x<image->width(); ++x) {
word = *(src++);
word |= ((*(src++)) << 8);
b = scale_5bits_to_8bits((word & 0x001f) >> 0);
g = scale_6bits_to_8bits((word & 0x07e0) >> 5);
r = scale_5bits_to_8bits((word & 0xf800) >> 11);
r = scale_5bits_to_8bits((word & r_mask) >> r_shift);
g = scale_6bits_to_8bits((word & g_mask) >> g_shift);
b = scale_5bits_to_8bits((word & b_mask) >> b_shift);
put_pixel_fast<RgbTraits>(image, x, y, rgba(r, g, b, 255));
}
src += padding;