promote SkImage::AlphaType to SkAlphaType

src/image/SkImage_Raster.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImage_Base.h"
 #include "SkImagePriv.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDataPixelRef.h"
 
 class SkImage_Raster : public SkImage_Base {
 public:
     static bool ValidArgs(const Info& info, size_t rowBytes) {
         const int maxDimension = SK_MaxS32 >> 2;
         const size_t kMaxPixelByteSize = SK_MaxS32;
 
         if (info.fWidth < 0 || info.fHeight < 0) {
             return false;
         }
         if (info.fWidth > maxDimension || info.fHeight > maxDimension) {
             return false;
         }
         if ((unsigned)info.fColorType > (unsigned)kLastEnum_ColorType) {
             return false;
         }
-        if ((unsigned)info.fAlphaType > (unsigned)kLastEnum_AlphaType) {
+        if ((unsigned)info.fAlphaType > (unsigned)kLastEnum_SkAlphaType) {
             return false;
         }
 
         bool isOpaque;
         if (SkImageInfoToBitmapConfig(info, &isOpaque) == SkBitmap::kNo_Config) {
             return false;
         }
 
         // TODO: check colorspace
 
@@ skipping 121 matching lines @@
 }
 
 SkImage* SkNewImageFromPixelRef(const SkImage::Info& info, SkPixelRef* pr,
                                 size_t rowBytes) {
     return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
 }
 
 SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
     return ((SkImage_Raster*)image)->getPixelRef();
 }