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

fix android framework build errors

Browse Source 
Review URL: https://codereview.chromium.org/637953002
This commit is contained in:
djsollen 2014-10-08 07:12:11 -07:00 committed by Commit bot
parent 9cf45bf119
commit 901704b34e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gm/dftext.cpp
View File

@ -41,7 +41,7 @@ protected:
}
virtual void onDraw(SkCanvas* inputCanvas) {
#if SK_BUILD_FOR_ANDROID
#ifdef SK_BUILD_FOR_ANDROID
SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f };
#else
SkScalar textSizes[] = { 11.0f, 11.0f*2.0f, 11.0f*5.0f, 11.0f*2.0f*5.0f };
@ -155,7 +155,7 @@ protected:
x = SkIntToScalar(680);
y = SkIntToScalar(270);
#if SK_BUILD_FOR_ANDROID
#ifdef SK_BUILD_FOR_ANDROID
paint.setTextSize(SkIntToScalar(19));
#else
paint.setTextSize(SkIntToScalar(22));
@ -173,7 +173,7 @@ protected:
x = SkIntToScalar(830);
y = SkIntToScalar(270);
#if SK_BUILD_FOR_ANDROID
#ifdef SK_BUILD_FOR_ANDROID
paint.setTextSize(SkIntToScalar(19));
#else
paint.setTextSize(SkIntToScalar(22));