wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 595375: Fail brush creation when bitmap creation fails. r=jrmuizel

Browse Source
This commit is contained in:
Bas Schouten 2012-05-20 22:29:07 +02:00
parent fa985706d7
commit ee5382e0bf
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/cairo/cairo/src/cairo-d2d-surface.cpp
View File

@ -1710,6 +1710,8 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
const cairo_pattern_t *pattern,
bool unique = false)
{
HRESULT hr;
if (pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
cairo_solid_pattern_t *sourcePattern =
(cairo_solid_pattern_t*)pattern;
@ -1969,12 +1971,16 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
}
} else {
if (pattern->extend != CAIRO_EXTEND_NONE) {
d2dsurf->rt->CreateBitmap(D2D1::SizeU(width, height),
data + yoffset * stride + xoffset * Bpp,
stride,
D2D1::BitmapProperties(D2D1::PixelFormat(format,
alpha)),
&sourceBitmap);
hr = d2dsurf->rt->CreateBitmap(D2D1::SizeU(width, height),
data + yoffset * stride + xoffset * Bpp,
stride,
D2D1::BitmapProperties(D2D1::PixelFormat(format,
alpha)),
&sourceBitmap);
if (FAILED(hr)) {
return NULL;
}
} else {
/**
* Trick here, we create a temporary rectangular
@ -1995,13 +2001,17 @@ _cairo_d2d_create_brush_for_pattern(cairo_d2d_surface_t *d2dsurf,
width * Bpp);
}
d2dsurf->rt->CreateBitmap(D2D1::SizeU(tmpWidth, tmpHeight),
tmp,
tmpWidth * Bpp,
D2D1::BitmapProperties(D2D1::PixelFormat(format,
D2D1_ALPHA_MODE_PREMULTIPLIED)),
&sourceBitmap);
hr = d2dsurf->rt->CreateBitmap(D2D1::SizeU(tmpWidth, tmpHeight),
tmp,
tmpWidth * Bpp,
D2D1::BitmapProperties(D2D1::PixelFormat(format,
D2D1_ALPHA_MODE_PREMULTIPLIED)),
&sourceBitmap);
delete [] tmp;
if (FAILED(hr)) {
return NULL;
}
}
if (!partial) {