remove alphatype from colortable

samplecode/SampleDitherBitmap.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
@@ skipping 39 matching lines @@
     path.getBounds().round(&bounds);
     SkRegion clip(bounds);
     return region.setPath(path, clip); // <-- !! DOWN !!
 }
 
 static SkBitmap make_bitmap() {
     SkPMColor c[256];
     for (int i = 0; i < 256; i++) {
         c[i] = SkPackARGB32(0xFF, i, 0, 0);
     }
-    SkColorTable* ctable = new SkColorTable(c, 256, kOpaque_SkAlphaType);
+    SkColorTable* ctable = new SkColorTable(c, 256);
 
     SkBitmap bm;
-    bm.allocPixels(SkImageInfo::Make(256, 32, kIndex_8_SkColorType,
-                                     kPremul_SkAlphaType),
+    bm.allocPixels(SkImageInfo::Make(256, 32, kIndex_8_SkColorType, kPremul_SkAlphaType),
                    NULL, ctable);
     ctable->unref();
 
     bm.lockPixels();
     for (int y = 0; y < bm.height(); y++) {
         uint8_t* p = bm.getAddr8(0, y);
         for (int x = 0; x < 256; x++) {
             p[x] = x;
         }
     }
@@ skipping 67 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DitherBitmapView; }
 static SkViewRegister reg(MyFactory);