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

include/core/SkXfermode.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.
  */
 
 
 #ifndef SkXfermode_DEFINED
@@ skipping 108 matching lines @@
         kSoftLight_Mode,
         kDifference_Mode,
         kExclusion_Mode,
         kMultiply_Mode,
 
         kHue_Mode,
         kSaturation_Mode,
         kColor_Mode,
         kLuminosity_Mode,
 
-        kLastMode = kLuminosity_Mode
+        kLastMode = kLuminosity_Mode,
+    };
+    enum {
+        kModeCount = kLastMode + 1

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

Why is this public now?

[tfarina, 2013/03/28 21:41:48]

So I can use it at line 267 of SkDrawPaint.cpp
xfermode != SkXfermode::kModeCount

     };
 
     /**
      *  If the xfermode is one of the modes in the Mode enum, then asMode()
      *  returns true and sets (if not null) mode accordingly. Otherwise it
      *  returns false and ignores the mode parameter.
      */
     virtual bool asMode(Mode* mode) const;
 
     /**
@@ skipping 68 matching lines @@
         method, 1 color at a time (upscaled to a SkPMColor). The default
         implmentation of this method just returns dst. If performance is
         important, your subclass should override xfer32/xfer16/xferA8 directly.
 
         This method will not be called directly by the client, so it need not
         be implemented if your subclass has overridden xfer32/xfer16/xferA8
     */
     virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
 
 private:
-    enum {
-        kModeCount = kLastMode + 1
-    };
     typedef SkFlattenable INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /** \class SkProcXfermode
 
     SkProcXfermode is a xfermode that applies the specified proc to its colors.
     This class is not exported to java.
 */
@@ skipping 23 matching lines @@
         fProc = proc;
     }
 
 private:
     SkXfermodeProc  fProc;
 
     typedef SkXfermode INHERITED;
 };
 
 #endif