Update she for skia-m67 on Linux

This commit is contained in:
David Capello 2018-07-16 18:10:54 -03:00
parent e6e74977c9
commit 424d465144
2 changed files with 2 additions and 4 deletions

View File

@ -197,7 +197,8 @@ endif()
if(USE_SKIA_BACKEND)
target_link_libraries(she
${SKIA_LIBRARIES})
${SKIA_LIBRARIES}
${X11_LIBRARIES})
if(UNIX AND NOT APPLE)
target_link_libraries(she fontconfig)

View File

@ -25,8 +25,6 @@ namespace {
bool convert_skia_bitmap_to_ximage(const SkBitmap& bitmap, XImage& image)
{
bitmap.lockPixels();
memset(&image, 0, sizeof(image));
int bpp = 8*bitmap.bytesPerPixel();
image.width = bitmap.width();
@ -42,7 +40,6 @@ bool convert_skia_bitmap_to_ximage(const SkBitmap& bitmap, XImage& image)
image.bits_per_pixel = bpp;
bool result = XInitImage(&image);
bitmap.unlockPixels();
return result;
}