зеркало из https://github.com/mozilla/gecko-dev.git
Bug 723942 - ImageLayerD3D*.cpp does not compile on mingw r=bas
--HG-- extra : rebase_source : e98c15c62a8998c1c646a5d9851ec96514f0b376
This commit is contained in:
Родитель
76184fa10c
Коммит
31719e089e
|
@ -132,7 +132,7 @@ ImageLayerD3D10::RenderLayer()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cairoImage->GetBackendData(LayerManager::LAYERS_D3D10)) {
|
if (!cairoImage->GetBackendData(LayerManager::LAYERS_D3D10)) {
|
||||||
nsAutoPtr<CairoD3D10BackendData> dat = new CairoD3D10BackendData();
|
nsAutoPtr<CairoD3D10BackendData> dat(new CairoD3D10BackendData());
|
||||||
dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
|
dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
|
||||||
|
|
||||||
if (dat->mTexture) {
|
if (dat->mTexture) {
|
||||||
|
@ -276,8 +276,8 @@ ImageLayerD3D10::RenderLayer()
|
||||||
|
|
||||||
void ImageLayerD3D10::AllocateTexturesYCbCr(PlanarYCbCrImage *aImage)
|
void ImageLayerD3D10::AllocateTexturesYCbCr(PlanarYCbCrImage *aImage)
|
||||||
{
|
{
|
||||||
nsAutoPtr<PlanarYCbCrD3D10BackendData> backendData =
|
nsAutoPtr<PlanarYCbCrD3D10BackendData> backendData(
|
||||||
new PlanarYCbCrD3D10BackendData;
|
new PlanarYCbCrD3D10BackendData);
|
||||||
|
|
||||||
PlanarYCbCrImage::Data &data = aImage->mData;
|
PlanarYCbCrImage::Data &data = aImage->mData;
|
||||||
|
|
||||||
|
|
|
@ -141,8 +141,8 @@ static void AllocateTexturesYCbCr(PlanarYCbCrImage *aImage,
|
||||||
IDirect3DDevice9 *aDevice,
|
IDirect3DDevice9 *aDevice,
|
||||||
LayerManagerD3D9 *aManager)
|
LayerManagerD3D9 *aManager)
|
||||||
{
|
{
|
||||||
nsAutoPtr<PlanarYCbCrD3D9BackendData> backendData =
|
nsAutoPtr<PlanarYCbCrD3D9BackendData> backendData(
|
||||||
new PlanarYCbCrD3D9BackendData;
|
new PlanarYCbCrD3D9BackendData);
|
||||||
|
|
||||||
PlanarYCbCrImage::Data &data = aImage->mData;
|
PlanarYCbCrImage::Data &data = aImage->mData;
|
||||||
|
|
||||||
|
@ -323,7 +323,7 @@ ImageLayerD3D9::RenderLayer()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cairoImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
|
if (!cairoImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
|
||||||
nsAutoPtr<CairoD3D9BackendData> dat = new CairoD3D9BackendData();
|
nsAutoPtr<CairoD3D9BackendData> dat(new CairoD3D9BackendData());
|
||||||
dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
|
dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
|
||||||
|
|
||||||
if (dat->mTexture) {
|
if (dat->mTexture) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче