mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use get_current_palette() in set_win32_clipboard_bitmap()

Browse Source
This commit is contained in:
David Capello 2015-05-18 21:18:02 -03:00
parent dd4683a27b
commit e106f6feec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/util/clipboard.cpp
View File

@ -20,7 +20,6 @@
#include "app/modules/editors.h" #include "app/modules/editors.h"
#include "app/modules/gfx.h" #include "app/modules/gfx.h"
#include "app/modules/gui.h" #include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/transaction.h" #include "app/transaction.h"
#include "app/ui/color_bar.h" #include "app/ui/color_bar.h"
#include "app/ui/editor/editor.h" #include "app/ui/editor/editor.h"

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

@ -90,6 +90,7 @@ static void set_win32_clipboard_bitmap(Image* image, Palette* palette)
color_depth = 32; color_depth = 32;
break; break;
case IMAGE_INDEXED: case IMAGE_INDEXED:
ASSERT(palette);
padding = (4-(image->width()&3))&3; padding = (4-(image->width()&3))&3;
scanline = sizeof(uint8_t) * image->width(); scanline = sizeof(uint8_t) * image->width();
scanline += padding; scanline += padding;
@ -150,7 +151,7 @@ static void set_win32_clipboard_bitmap(Image* image, Palette* palette)
break; break;
} }
case IMAGE_INDEXED: { case IMAGE_INDEXED: {
Palette* palette = app::get_current_palette(); ASSERT(palette);
RGBQUAD* rgbquad = (RGBQUAD*)(((uint8_t*)bi)+bi->bV5Size); RGBQUAD* rgbquad = (RGBQUAD*)(((uint8_t*)bi)+bi->bV5Size);
for (int i=0; i<palette->size(); ++i) { for (int i=0; i<palette->size(); ++i) {
rgbquad->rgbRed = rgba_getr(palette->getEntry(i)); rgbquad->rgbRed = rgba_getr(palette->getEntry(i));