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

include/core/SkPaint.h

 
 
 /*
  * 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.
  */
 
 
@@ skipping 368 matching lines @@
 
     /** Cap enum specifies the settings for the paint's strokecap. This is the
         treatment that is applied to the beginning and end of each non-closed
         contour (e.g. lines).
     */
     enum Cap {
         kButt_Cap,      //!< begin/end contours with no extension
         kRound_Cap,     //!< begin/end contours with a semi-circle extension
         kSquare_Cap,    //!< begin/end contours with a half square extension
 
+        kDefault_Cap = kButt_Cap,

[reed1, 2013/03/28 13:13:07]

kCapCount now has the wrong value.

+
         kCapCount,
-        kDefault_Cap = kButt_Cap
     };
 
     /** Join enum specifies the settings for the paint's strokejoin. This is
         the treatment that is applied to corners in paths and rectangles.
     */
     enum Join {
         kMiter_Join,    //!< connect path segments with a sharp join
         kRound_Join,    //!< connect path segments with a round join
         kBevel_Join,    //!< connect path segments with a flat bevel join
 
+        kDefault_Join = kMiter_Join,

[reed1, 2013/03/28 13:13:07]

kJoinCount now has the wrong value.

+
         kJoinCount,
-        kDefault_Join = kMiter_Join
     };
 
     /** Return the paint's stroke cap type, controlling how the start and end
         of stroked lines and paths are treated.
         @return the line cap style for the paint, used whenever the paint's
                 style is Stroke or StrokeAndFill.
     */
     Cap getStrokeCap() const { return (Cap)fCapType; }
 
     /** Set the paint's stroke cap type.
@@ skipping 577 matching lines @@
     friend class SkTextToPathIter;
 
 #ifdef SK_BUILD_FOR_ANDROID
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
 #endif
 };
 
 #endif