add kGray_8_SkColorType

gm/filterbitmap.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 120 matching lines @@
           setTypeface(&paint, "Times", SkTypeface::kItalic);
           canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint);
           setTypeface(&paint, "Times", SkTypeface::kBoldItalic);
           canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint);
       }
   private:
       typedef FilterBitmapGM INHERITED;
 };
 
 class FilterBitmapCheckerboardGM: public FilterBitmapGM {
-  public:
-      FilterBitmapCheckerboardGM(int size, int num_checks)
-      : fSize(size), fNumChecks(num_checks)
-        {
-            fName.printf("filterbitmap_checkerboard_%d_%d", fSize, fNumChecks);
-        }
+public:
+    FilterBitmapCheckerboardGM(int size, int num_checks, bool convertToG8 = false)
+        : fSize(size), fNumChecks(num_checks), fConvertToG8(convertToG8)
+    {
+        fName.printf("filterbitmap_checkerboard_%d_%d%s",
+                     fSize, fNumChecks, convertToG8 ? "_g8" : "");
+    }
 
   protected:
       int fSize;
       int fNumChecks;
 
       SkScalar getScale() SK_OVERRIDE {
           return 192.f/fSize;
       }
 
       void makeBitmap() SK_OVERRIDE {
           fBM.allocN32Pixels(fSize, fSize);
           for (int y = 0; y < fSize; y ++) {
               for (int x = 0; x < fSize; x ++) {
                   SkPMColor* s = fBM.getAddr32(x, y);
                   int cx = (x * fNumChecks) / fSize;
                   int cy = (y * fNumChecks) / fSize;
                   if ((cx+cy)%2) {
                       *s = 0xFFFFFFFF;
                   } else {
                       *s = 0xFF000000;
                   }
               }
           }
+          if (fConvertToG8) {
+              SkBitmap tmp;
+              fBM.copyTo(&tmp, kGray_8_SkColorType);
+              fBM = tmp;
+          }
       }
-  private:
-      typedef FilterBitmapGM INHERITED;
+private:
+    const bool fConvertToG8;
+    typedef FilterBitmapGM INHERITED;
 };
 
 class FilterBitmapImageGM: public FilterBitmapGM {
-  public:
-      FilterBitmapImageGM(const char filename[])
-      : fFilename(filename)
-        {
-            fName.printf("filterbitmap_image_%s", filename);
-        }
+public:
+    FilterBitmapImageGM(const char filename[], bool convertToG8 = false)
+        : fFilename(filename), fConvertToG8(convertToG8)
+    {
+        fName.printf("filterbitmap_image_%s%s", filename, convertToG8 ? "_g8" : "");
+    }
 
-  protected:
+protected:
       SkString fFilename;
       int fSize;
 
       SkScalar getScale() SK_OVERRIDE {
           return 192.f/fSize;
       }
 
       void makeBitmap() SK_OVERRIDE {
           SkImageDecoder* codec = NULL;
           SkString resourcePath = GetResourcePath(fFilename.c_str());
           SkFILEStream stream(resourcePath.c_str());
           if (stream.isValid()) {
               codec = SkImageDecoder::Factory(&stream);
           }
           if (codec) {
               stream.rewind();
               codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
           } else {
               fBM.allocN32Pixels(1, 1);
               *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad
           }
           fSize = fBM.height();
+          if (fConvertToG8) {
+              SkBitmap tmp;
+              fBM.copyTo(&tmp, kGray_8_SkColorType);
+              fBM = tmp;
+          }
       }
-  private:
-      typedef FilterBitmapGM INHERITED;
+private:
+    const bool fConvertToG8;
+    typedef FilterBitmapGM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new FilterBitmapTextGM(3); )
 DEF_GM( return new FilterBitmapTextGM(7); )
 DEF_GM( return new FilterBitmapTextGM(10); )
 DEF_GM( return new FilterBitmapCheckerboardGM(4,4); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,32); )
+DEF_GM( return new FilterBitmapCheckerboardGM(32,32, true); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,8); )
 DEF_GM( return new FilterBitmapCheckerboardGM(32,2); )
 DEF_GM( return new FilterBitmapCheckerboardGM(192,192); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_16.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_32.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_64.png"); )
+DEF_GM( return new FilterBitmapImageGM("mandrill_64.png", true); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_128.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_256.png"); )
 DEF_GM( return new FilterBitmapImageGM("mandrill_512.png"); )
 DEF_GM( return new FilterBitmapImageGM("color_wheel.png"); )