Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part III of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6475053
git-svn-id: http://skia.googlecode.com/svn/trunk@5264 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleImage.cpp b/samplecode/SampleImage.cpp
index 8867baf..8fdf6b9 100644
--- a/samplecode/SampleImage.cpp
+++ b/samplecode/SampleImage.cpp
@@ -35,7 +35,7 @@
if (SkImageDecoder::DecodeStream(stream, bitmap, pref,
SkImageDecoder::kDecodeBounds_Mode, NULL)) {
SkASSERT(bitmap->config() != SkBitmap::kNo_Config);
-
+
SkImageRef* ref = new SkImageRef_GlobalPool(stream, bitmap->config());
ref->setURI(name);
bitmap->setPixelRef(ref)->unref();
@@ -50,34 +50,34 @@
SkBitmap* fBitmaps;
SkShader* fShader;
- ImageView() {
+ ImageView() {
SkImageRef_GlobalPool::SetRAMBudget(32 * 1024);
-
+
int i, N = SK_ARRAY_COUNT(gNames);
fBitmaps = new SkBitmap[N];
-
+
for (i = 0; i < N; i++) {
SkString str("/skimages/");
str.append(gNames[i]);
SkFILEStream* stream = new SkFILEStream(str.c_str());
-
+
SetImageRef(&fBitmaps[i], stream, SkBitmap::kNo_Config, gNames[i]);
if (i & 1)
fBitmaps[i].buildMipMap();
stream->unref();
}
-
+
fShader = SkShader::CreateBitmapShader(fBitmaps[5],
SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode);
-
+
if (true) {
SkMatrix m;
-
+
m.setRotate(SkIntToScalar(30));
fShader->setLocalMatrix(m);
}
-
+
#if 0
SkImageRef::DumpPool();
for (i = 0; i < N; i++) {
@@ -92,20 +92,20 @@
success = bm.lockPixels();
SkDebugf(" addr=%d", bm.getPixels());
if (success)
- bm.unlockPixels();
+ bm.unlockPixels();
SkDebugf("\n");
}
SkImageRef::DumpPool();
#endif
}
-
+
virtual ~ImageView() {
delete[] fBitmaps;
delete fShader;
SkImageRef_GlobalPool::DumpPool();
}
-
+
protected:
// overrides from SkEventSink
virtual bool onQuery(SkEvent* evt) {
@@ -115,43 +115,43 @@
}
return this->INHERITED::onQuery(evt);
}
-
+
void drawBG(SkCanvas* canvas) {
canvas->drawColor(0xFFDDDDDD);
// canvas->drawColor(SK_ColorWHITE);
}
-
+
virtual void onDraw(SkCanvas* canvas) {
this->drawBG(canvas);
-
+
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
-
+
SkScalar x = 0, y = 0;
-
+
for (size_t i = 0; i < SK_ARRAY_COUNT(gNames); i++) {
canvas->drawBitmap(fBitmaps[i], x, y);
x += SkIntToScalar(fBitmaps[i].width() + 10);
}
-
+
canvas->translate(0, SkIntToScalar(120));
SkPaint paint;
paint.setShader(fShader);
paint.setFilterBitmap(true);
SkRect r = { 0, 0, SkIntToScalar(300), SkIntToScalar(100) };
-
+
canvas->drawRect(r, paint);
}
-
+
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
this->inval(NULL);
return this->INHERITED::onFindClickHandler(x, y);
}
-
+
virtual bool onClick(Click* click) {
return this->INHERITED::onClick(click);
}
-
+
private:
typedef SkView INHERITED;
};