diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-29 16:53:30 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-29 16:53:30 +0000 |
| commit | e80c2bc80e2939936744a9001ba2f24e6f97903d (patch) | |
| tree | 257f48b582a472c84a9ccf2fa8c2315680ef586e /src | |
| parent | 964988f0e93f4a559b7e41db53d70d0282527350 (diff) | |
Fix more clang tautological-constant-out-of-range-compare errors.
And one of unused-private-field:
samplecode/SampleStrokeText.cpp:109:10: error: private field 'fAA' is not used [-Werror,-Wunused-private-field]
bool fAA;
R=bsalomon@google.com,reed@google.com
Review URL: https://codereview.chromium.org/12906016
git-svn-id: http://skia.googlecode.com/svn/trunk@8445 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/animator/SkDrawPaint.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/animator/SkDrawPaint.cpp b/src/animator/SkDrawPaint.cpp index 4d1bd8b430..22d99e4f21 100644 --- a/src/animator/SkDrawPaint.cpp +++ b/src/animator/SkDrawPaint.cpp @@ -224,7 +224,7 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const { // stroke is legacy; style setting if present overrides stroke if (stroke != -1) paint->setStyle(SkToBool(stroke) ? SkPaint::kStroke_Style : SkPaint::kFill_Style); - if (style != (SkPaint::Style) -1) + if (style != -1) paint->setStyle((SkPaint::Style) style); if (linearText != -1) paint->setLinearText(SkToBool(linearText)); @@ -242,15 +242,15 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const { SkSafeUnref(paint->setShader(shader->getShader())); if (strikeThru != -1) paint->setStrikeThruText(SkToBool(strikeThru)); - if (strokeCap != (SkPaint::Cap) -1) + if (strokeCap != -1) paint->setStrokeCap((SkPaint::Cap) strokeCap); - if (strokeJoin != (SkPaint::Join) -1) + if (strokeJoin != -1) paint->setStrokeJoin((SkPaint::Join) strokeJoin); if (SkScalarIsNaN(strokeMiter) == false) paint->setStrokeMiter(strokeMiter); if (SkScalarIsNaN(strokeWidth) == false) paint->setStrokeWidth(strokeWidth); - if (textAlign != (SkPaint::Align) -1) + if (textAlign != -1) paint->setTextAlign((SkPaint::Align) textAlign); if (SkScalarIsNaN(textScaleX) == false) paint->setTextScaleX(textScaleX); @@ -264,6 +264,6 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const { SkSafeUnref(paint->setTypeface(typeface->getTypeface())); if (underline != -1) paint->setUnderlineText(SkToBool(underline)); - if (xfermode != (SkXfermode::Mode) -1) + if (xfermode != -1) paint->setXfermodeMode((SkXfermode::Mode) xfermode); } |