Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 573013: Report more appropriate errors from acquire_source_image. r=jrmuizel a=blocking-beta5

Browse Source
This commit is contained in:
Bas Schouten 2010-08-27 22:12:03 +00:00
parent cde5a090e7
commit 5257eb8592
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2425,7 +2425,7 @@ _cairo_d2d_acquire_source_image(void *abstract_surface,
softDesc.BindFlags = 0;
hr = d2dsurf->device->mD3D10Device->CreateTexture2D(&softDesc, NULL, &softTexture);
if (FAILED(hr)) {
return CAIRO_STATUS_NO_MEMORY;
return _cairo_error(CAIRO_STATUS_NO_MEMORY);
}
d2dsurf->device->mD3D10Device->CopyResource(softTexture, d2dsurf->surface);
@ -2433,7 +2433,7 @@ _cairo_d2d_acquire_source_image(void *abstract_surface,
D3D10_MAPPED_TEXTURE2D data;
hr = softTexture->Map(0, D3D10_MAP_READ_WRITE, 0, &data);
if (FAILED(hr)) {
return (cairo_status_t)CAIRO_INT_STATUS_UNSUPPORTED;
return _cairo_error(CAIRO_STATUS_NO_DEVICE);
}
*image_out =
(cairo_image_surface_t*)_cairo_image_surface_create_for_data_with_content((unsigned char*)data.pData,
@ -2498,14 +2498,14 @@ _cairo_d2d_acquire_dest_image(void *abstract_surface,
softDesc.BindFlags = 0;
hr = d2dsurf->device->mD3D10Device->CreateTexture2D(&softDesc, NULL, &softTexture);
if (FAILED(hr)) {
return CAIRO_STATUS_NO_MEMORY;
return _cairo_error(CAIRO_STATUS_NO_MEMORY);
}
d2dsurf->device->mD3D10Device->CopyResource(softTexture, d2dsurf->surface);
D3D10_MAPPED_TEXTURE2D data;
hr = softTexture->Map(0, D3D10_MAP_READ_WRITE, 0, &data);
if (FAILED(hr)) {
return (cairo_status_t)CAIRO_INT_STATUS_UNSUPPORTED;
return _cairo_error(CAIRO_STATUS_NO_DEVICE);
}
*image_out =
(cairo_image_surface_t*)_cairo_image_surface_create_for_data_with_content((unsigned char*)data.pData,