Fix more clang tautological-constant-out-of-range-compare errors.

src/animator/SkDrawPaint.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawPaint.h"
@@ skipping 206 matching lines @@
         paint->setAntiAlias(SkToBool(antiAlias));
     if (color != NULL)
         paint->setColor(color->getColor());
     if (fakeBold != -1)
         paint->setFakeBoldText(SkToBool(fakeBold));
     if (filterBitmap != -1)
         paint->setFilterBitmap(SkToBool(filterBitmap));
     //  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));
     if (maskFilter == NULL)
         paint->setMaskFilter(NULL);
     else if (maskFilter != (SkDrawMaskFilter*) -1)
         SkSafeUnref(paint->setMaskFilter(maskFilter->getMaskFilter()));
     if (pathEffect == NULL)
         paint->setPathEffect(NULL);
     else if (pathEffect != (SkDrawPathEffect*) -1)
         SkSafeUnref(paint->setPathEffect(pathEffect->getPathEffect()));
     if (shader == NULL)
         paint->setShader(NULL);
     else if (shader != (SkDrawShader*) -1)
         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);
     if (SkScalarIsNaN(textSize) == false)
         paint->setTextSize(textSize);
     if (SkScalarIsNaN(textSkewX) == false)
         paint->setTextSkewX(textSkewX);
     if (typeface == NULL)
         paint->setTypeface(NULL);
     else if (typeface != (SkDrawTypeface*) -1)
         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);
 }