mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw exceptions if a SkBitmap cannot be created on SkiaSurface

Browse Source 
Maybe in the future we might avoid throwing exceptions from the "she"
layer and just return an error code.
This commit is contained in:
David Capello 2016-03-29 20:04:49 -03:00
parent aea1e24e32
commit 677fe41316
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/she/skia/skia_surface.h
View File

@ -1,5 +1,5 @@
// SHE library
// Copyright (C) 2012-2015 David Capello
// Copyright (C) 2012-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -8,6 +8,7 @@
#define SHE_SKIA_SKIA_SURFACE_INCLUDED
#pragma once
#include "base/exception.h"
#include "gfx/clip.h"
#include "she/common/font.h"
#include "she/locked_surface.h"
@ -56,20 +57,22 @@ public:
void create(int width, int height) {
ASSERT(!m_surface);
m_bitmap.tryAllocPixels(
SkImageInfo::MakeN32Premul(width, height));
m_bitmap.eraseColor(SK_ColorTRANSPARENT);
if (!m_bitmap.tryAllocPixels(
SkImageInfo::MakeN32Premul(width, height)))
throw base::Exception("Cannot create Skia surface");
m_bitmap.eraseColor(SK_ColorTRANSPARENT);
rebuild();
}
void createRgba(int width, int height) {
ASSERT(!m_surface);
m_bitmap.tryAllocPixels(
SkImageInfo::MakeN32Premul(width, height));
m_bitmap.eraseColor(SK_ColorTRANSPARENT);
if (!m_bitmap.tryAllocPixels(
SkImageInfo::MakeN32Premul(width, height)))
throw base::Exception("Cannot create Skia surface");
m_bitmap.eraseColor(SK_ColorTRANSPARENT);
rebuild();
}
@ -131,7 +134,9 @@ public:
m_paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
{
SkBitmap bitmap;
bitmap.tryAllocPixels(SkImageInfo::MakeN32Premul(8, 8));
if (!bitmap.tryAllocPixels(SkImageInfo::MakeN32Premul(8, 8)))
throw base::Exception("Cannot create temporary Skia surface");
{
bitmap.lockPixels();
SkPMColor bg = SkPreMultiplyARGB(255, 0, 0, 0);
@ -164,8 +169,9 @@ public:
ASSERT(!m_surface);
SkBitmap result;
result.tryAllocPixels(
SkImageInfo::MakeN32Premul(width()*scaleFactor, height()*scaleFactor));
if (!result.tryAllocPixels(
SkImageInfo::MakeN32Premul(width()*scaleFactor, height()*scaleFactor)))
throw base::Exception("Cannot create temporary Skia surface to change scale");
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);