AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The motivation for this changeset is to fix the following build failure in google3-

Browse Source 
third_party/skia/src/core/SkCanvas.cpp:1711:61: error: non-constant-expression cannot be narrowed from type 'int32_t' (aka 'int') to 'SkScalar' (aka 'float') in initializer list [-Wc++11-narrowing]
        0, SkIntToScalar(c.fLeft), SkIntToScalar(c.fRight), w
                                                            ^
third_party/skia/src/core/SkCanvas.cpp:1711:61: note: override this message by inserting an explicit cast
        0, SkIntToScalar(c.fLeft), SkIntToScalar(c.fRight), w
                                                            ^
                                                            static_cast<SkScalar>( )
Review URL: https://codereview.appspot.com/7041044

git-svn-id: http://skia.googlecode.com/svn/trunk@6979 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
rmistry@google.com 2013-01-02 22:03:54 +00:00
parent 672d5c2014
commit 7d474f8a84
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkCanvas.cpp
View File

@ -1708,10 +1708,10 @@ void SkCanvas::internalDrawBitmapNine(const SkBitmap& bitmap,
c.fBottom = SkPin32(center.fBottom, c.fTop, h);
const SkScalar srcX[4] = {
0, SkIntToScalar(c.fLeft), SkIntToScalar(c.fRight), w
0, SkIntToScalar(c.fLeft), SkIntToScalar(c.fRight), SkIntToScalar(w)
};
const SkScalar srcY[4] = {
0, SkIntToScalar(c.fTop), SkIntToScalar(c.fBottom), h
0, SkIntToScalar(c.fTop), SkIntToScalar(c.fBottom), SkIntToScalar(h)
};
SkScalar dstX[4] = {
dst.fLeft, dst.fLeft + SkIntToScalar(c.fLeft),