corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 620171 - [@ ImageContainerOGL::GetCurrentAsSurface] if GetFormat() can return anything other than PLANAR_YCBCR or CAIRO_SURFACE

Browse Source 
r=bgirard
This commit is contained in:
2011-10-10 15:27:05 +01:00
parent 0d7423e2ea
commit 33bff001b8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/opengl/ImageLayerOGL.cpp
View File

@@ -313,14 +313,18 @@ ImageContainerOGL::GetCurrentAsSurface(gfxIntSize *aSize)
return imageSurface.forget().get();
}
if (mActiveImage->GetFormat() == Image::CAIRO_SURFACE) {
CairoImageOGL *cairoImage =
static_cast<CairoImageOGL*>(mActiveImage.get());
size = cairoImage->mSize;
gl = cairoImage->mTexture.GetGLContext();
tex1 = cairoImage->mTexture.GetTextureID();
if (mActiveImage->GetFormat() != Image::CAIRO_SURFACE)
{
*aSize = gfxIntSize(0, 0);
return nsnull;
}
CairoImageOGL *cairoImage =
static_cast<CairoImageOGL*>(mActiveImage.get());
size = cairoImage->mSize;
gl = cairoImage->mTexture.GetGLContext();
tex1 = cairoImage->mTexture.GetTextureID();
nsRefPtr<gfxImageSurface> s = gl->ReadTextureImage(tex1, size, LOCAL_GL_RGBA);
*aSize = size;
return s.forget();