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 944908 - Fixed mingw compilation in gfx/2d/. r=bas.schouten

Browse Source
This commit is contained in:
Jacek Caban 2013-12-23 14:03:16 +01:00
parent bb6a90e9ab
commit 0ada8f7573
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/2d/DrawTargetD2D1.cpp
View File

@ -69,9 +69,7 @@ DrawTargetD2D1::DrawSurface(SourceSurface *aSurface,
const DrawSurfaceOptions &aSurfOptions,
const DrawOptions &aOptions)
{
Matrix mat;
RefPtr<ID2D1Image> image = GetImageForSurface(aSurface, mat, EXTEND_CLAMP);
RefPtr<ID2D1Image> image = GetImageForSurface(aSurface, EXTEND_CLAMP);
if (!image) {
gfxWarning() << *this << ": Unable to get D2D image for surface.";
@ -186,9 +184,8 @@ DrawTargetD2D1::MaskSurface(const Pattern &aSource,
const DrawOptions &aOptions)
{
RefPtr<ID2D1Bitmap> bitmap;
Matrix mat;
RefPtr<ID2D1Image> image = GetImageForSurface(aMask, mat, EXTEND_CLAMP);
RefPtr<ID2D1Image> image = GetImageForSurface(aMask, EXTEND_CLAMP);
PrepareForDrawing(aOptions.mCompositionOp, aSource);

5
gfx/2d/DrawTargetD2D1.h
View File

@ -128,6 +128,11 @@ public:
TemporaryRef<ID2D1Image> GetImageForSurface(SourceSurface *aSurface, Matrix &aSourceTransform,
ExtendMode aExtendMode);
TemporaryRef<ID2D1Image> GetImageForSurface(SourceSurface *aSurface, ExtendMode aExtendMode) {
Matrix mat;
return GetImageForSurface(aSurface, mat, aExtendMode);
}
static ID2D1Factory1 *factory();
static void CleanupD2D();
static IDWriteFactory *GetDWriteFactory();

2
gfx/2d/FilterNodeD2D1.cpp
View File

@ -129,7 +129,7 @@ D2D1_CHANNEL_SELECTOR D2DChannelSelector(uint32_t aMode)
TemporaryRef<ID2D1Image> GetImageForSourceSurface(DrawTarget *aDT, SourceSurface *aSurface)
{
if (aDT->GetType() == BACKEND_DIRECT2D1_1) {
return static_cast<DrawTargetD2D1*>(aDT)->GetImageForSurface(aSurface, Matrix(), EXTEND_CLAMP);
return static_cast<DrawTargetD2D1*>(aDT)->GetImageForSurface(aSurface, EXTEND_CLAMP);
}
RefPtr<ID2D1Image> image;
switch (aSurface->GetType()) {

2
gfx/2d/Logging.h
View File

@ -83,6 +83,8 @@ public:
Log &operator <<(bool aBool) { mMessage << (aBool ? "true" : "false"); return *this; }
Log &operator <<(int aInt) { mMessage << aInt; return *this; }
Log &operator <<(unsigned int aInt) { mMessage << aInt; return *this; }
Log &operator <<(long aLong) { mMessage << aLong; return *this; }
Log &operator <<(unsigned long aLong) { mMessage << aLong; return *this; }
Log &operator <<(Float aFloat) { mMessage << aFloat; return *this; }
Log &operator <<(double aDouble) { mMessage << aDouble; return *this; }
Log &operator <<(const Point &aPoint)