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

fix broken build due to coloremoji gm.

Browse Source 
- fix SkIntToScalar warnings on windows
 - disable the test on Android until freetype changes are submitted

Review URL: https://codereview.chromium.org/23952005

git-svn-id: http://skia.googlecode.com/svn/trunk@11319 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-09-17 16:17:52 +00:00
parent 6def2a2dc7
commit d8807976e7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gm/coloremoji.cpp
View File

@ -59,8 +59,8 @@ protected:
const int textYOffset[] = { 10, 40, 100};
SkASSERT(sizeof(textSize) == sizeof(textYOffset));
for (size_t y = 0; y < sizeof(textSize) / sizeof(int); ++y) {
paint.setTextSize(textSize[y]);
canvas->drawText(text, strlen(text), 10, textYOffset[y], paint);
paint.setTextSize(SkIntToScalar(textSize[y]));
canvas->drawText(text, strlen(text), 10, SkIntToScalar(textYOffset[y]), paint);
}
// setup work needed to draw text with different clips
@ -110,7 +110,10 @@ private:
//////////////////////////////////////////////////////////////////////////////
#if !defined(SK_BUILD_FOR_ANDROID)
// fail for now until the appropriate freetype changes are submitted
static GM* MyFactory(void*) { return new ColorEmojiGM; }
static GMRegistry reg(MyFactory);
#endif
}