SampleApp Cleanup

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 19 matching lines @@
 
     SkPaint p;
     p.setShader(s)->unref();
     draw_rect(canvas, r, p);
 
     canvas->translate(0, SkIntToScalar(40));
     p.setDither(true);
     draw_rect(canvas, r, p);
 }
 
-static void test_pathregion() {
+static bool test_pathregion() {
     SkPath path;
     SkRegion region;
     path.moveTo(25071800.f, -141823808.f);
     path.lineTo(25075500.f, -141824000.f);
     path.lineTo(25075400.f, -141827712.f);
     path.lineTo(25071810.f, -141827600.f);
     path.close();
 
     SkIRect bounds;
     path.getBounds().round(&bounds);
     SkRegion clip(bounds);
-    bool result = region.setPath(path, clip); // <-- !! DOWN !!
-    SkDebugf("----- result %d\n", result);
+    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);
 
     SkBitmap bm;
     bm.setConfig(SkBitmap::kIndex8_Config, 256, 32);
     bm.allocPixels(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;
         }
     }
     bm.unlockPixels();
     return bm;
 }
 
 class DitherBitmapView : public SampleView {
     SkBitmap    fBM8;
     SkBitmap    fBM32;
+    bool        fResult;
 public:
     DitherBitmapView() {
-        test_pathregion();
+        fResult = test_pathregion();
         fBM8 = make_bitmap();
         fBM8.copyTo(&fBM32, SkBitmap::kARGB_8888_Config);
 
         this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
     // overrides from SkEventSink
     virtual bool onQuery(SkEvent* evt) {
         if (SampleCode::TitleQ(*evt)) {
@@ skipping 36 matching lines @@
 
     virtual void onDrawContent(SkCanvas* canvas) {
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
 
         draw2(canvas, fBM8);
         canvas->translate(0, SkIntToScalar(fBM8.height() *3));
         draw2(canvas, fBM32);
 
         canvas->translate(0, SkIntToScalar(fBM8.height() *3));
         draw_gradient(canvas);
+
+        char resultTrue[] = "SkRegion::setPath returned true";
+        char resultFalse[] = "SkRegion::setPath returned false";
+        SkPaint p;
+        if (fResult)
+            canvas->drawText(resultTrue, sizeof(resultTrue) - 1, 0, 50, p);
+        else
+            canvas->drawText(resultFalse, sizeof(resultFalse) - 1, 0, 50, p);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DitherBitmapView; }
 static SkViewRegister reg(MyFactory);