diff options
author | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-05-22 20:44:12 +0000 |
---|---|---|
committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-05-22 20:44:12 +0000 |
commit | 671cd656785de5e84564b6ffe4831625d7016ded (patch) | |
tree | eea4b9e21a459d2b5c183f24b2eeb47cfe0be294 /samplecode | |
parent | 149e2f6159a797989f6f0fa93ecfaa66cdd55c40 (diff) |
add SDL support
git-svn-id: http://skia.googlecode.com/svn/trunk@182 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SamplePathEffects.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleRegion.cpp | 6 | ||||
-rw-r--r-- | samplecode/SampleText.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp index 4e964d776f..e2b5f5a822 100644 --- a/samplecode/SamplePathEffects.cpp +++ b/samplecode/SamplePathEffects.cpp @@ -203,7 +203,7 @@ protected: } gPhase -= SK_Scalar1; - this->inval(nil); + this->inval(NULL); SkPaint paint; diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp index 5dc69cb629..62590006f9 100644 --- a/samplecode/SampleRegion.cpp +++ b/samplecode/SampleRegion.cpp @@ -226,7 +226,7 @@ protected: // SkShader* shader = SkShader::CreateBitmapShader(bm, false, SkPaint::kBilinear_FilterType, SkShader::kRepeat_TileMode); SkPoint pts[] = { 0, 0, SkIntToScalar(100), SkIntToScalar(0) }; SkColor colors[] = { SK_ColorBLACK, SK_ColorWHITE }; - SkShader* shader = SkGradientShader::CreateLinear(pts, colors, nil, 2, SkShader::kMirror_TileMode); + SkShader* shader = SkGradientShader::CreateLinear(pts, colors, NULL, 2, SkShader::kMirror_TileMode); paint.setShader(shader)->unref(); canvas->drawPaint(paint); @@ -323,14 +323,14 @@ protected: virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) { - return fRect.contains(SkScalarRound(x), SkScalarRound(y)) ? new Click(this) : nil; + return fRect.contains(SkScalarRound(x), SkScalarRound(y)) ? new Click(this) : NULL; } virtual bool onClick(Click* click) { fRect.offset(click->fICurr.fX - click->fIPrev.fX, click->fICurr.fY - click->fIPrev.fY); - this->inval(nil); + this->inval(NULL); return true; } diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index b8abac338d..83ff68d7ee 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -96,7 +96,7 @@ static void test_typefaceCache() SkTypeface* t2 = SkTypeface::CreateFromName("arial", SkTypeface::kNormal); SkTypeface* t3 = SkTypeface::CreateFromName("helvetica", SkTypeface::kItalic); -#ifndef SK_BUILD_FOR_MAC +#ifdef ANDROID SkASSERT(t0 == t1); SkASSERT(t0 == t2); SkASSERT(t0 == t3); |