update

git-svn-id: http://skia.googlecode.com/svn/trunk@350 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/Makefile b/Makefile
index 0e6d3c9..dff3457 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ out/libskia.a: Makefile $(OBJ_LIST) $(JUST_COMPILE_OBJS)
 ##############################################################################
 
 BENCH_SRCS := RectBench.cpp SkBenchmark.cpp benchmain.cpp BitmapBench.cpp \
-                         RepeatTileBench.cpp
+                         RepeatTileBench.cpp DecodeBench.cpp
 BENCH_SRCS := $(addprefix bench/, $(BENCH_SRCS))
 
 # add any optional codecs for this app

diff --git a/samplecode/SampleExtractAlpha.cpp b/samplecode/SampleExtractAlpha.cpp
index 37c49a0..928f2ca 100644 (file)
--- a/samplecode/SampleExtractAlpha.cpp
+++ b/samplecode/SampleExtractAlpha.cpp
@@ -67,19 +67,20 @@ protected:
     
     virtual void onDraw(SkCanvas* canvas) {
         drawBG(canvas);
+
+        SkPaint paint;
+        paint.setAntiAlias(true);
+        paint.setStyle(SkPaint::kStroke_Style);
+
+        SkMatrix matrix;
+        matrix.setScale(3.55f, 80.f);
+        canvas->setMatrix(matrix);
         
-        const SkBitmap* srcBM[] = { &fBM8, &fBM32, &fBM4 };
+        paint.setStrokeWidth(0.0588f);
+        canvas->drawLine(10, 5, 30, 4.8f, paint);
         
-        SkPaint paint;
-        paint.setColor(SK_ColorRED);
-        for (int i = 0; i < 3; i++) {
-            canvas->drawBitmap(*srcBM[i], 0, 0, &paint);
-            SkBitmap tmp;
-            srcBM[i]->extractAlpha(&tmp);
-            canvas->drawBitmap(tmp, 0, SkIntToScalar(tmp.height() + 10), &paint);
-            
-            canvas->translate(SkIntToScalar(tmp.width() + 10), 0);
-        }
+        paint.setStrokeWidth(0.06f);
+        canvas->drawLine(20, 5, 40, 4.8f, paint);
     }
     
 private: