separate image encode and decode
remove obsolete build-flag for encode
git-svn-id: http://skia.googlecode.com/svn/trunk@56 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index df0723f..0d2bbbc 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -2,7 +2,7 @@
#include "SkDevice.h"
#include "SkGLCanvas.h"
#include "SkGraphics.h"
-#include "SkImageDecoder.h"
+#include "SkImageEncoder.h"
#include "SkPaint.h"
#include "SkPicture.h"
#include "SkStream.h"
@@ -438,7 +438,7 @@
cleanup_for_filename(&name);
name.append(".png");
if (SkImageEncoder::EncodeFile(name.c_str(), this->getBitmap(),
- SkImageEncoder::kPNG_Type)) {
+ SkImageEncoder::kPNG_Type, 100)) {
SkDebugf("Created %s\n", name.c_str());
}
return true;
diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp
index e36ab42..e4197bf 100644
--- a/samplecode/SampleEncode.cpp
+++ b/samplecode/SampleEncode.cpp
@@ -3,7 +3,7 @@
#include "SkCanvas.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
-#include "SkImageDecoder.h"
+#include "SkImageEncoder.h"
#include "SkPath.h"
#include "SkPorterDuff.h"
#include "SkRegion.h"
@@ -129,7 +129,7 @@
remove(path.c_str());
SkImageEncoder* codec = SkImageEncoder::Create(gTypes[j]);
- if (!codec->encodeFile(path.c_str(), fBitmaps[i])) {
+ if (!codec->encodeFile(path.c_str(), fBitmaps[i], 100)) {
SkDebugf("------ failed to encode %s\n", path.c_str());
remove(path.c_str()); // remove any partial file
}
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 8958c82..d3fe062 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -279,28 +279,6 @@
canvas->translate(SkIntToScalar(200), 0);
}
-
- if (false)
- {
- SkBitmap bitmap;
-
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
- bitmap.allocPixels();
- bitmap.eraseColor(0);
-
- SkCanvas canvas(bitmap);
- SkPaint paint;
- SkRect r;
-
- paint.setAntiAlias(true);
- paint.setARGB(0xFF, 0xFF, 0, 0xFF);
- r.set(0, 0, SkIntToScalar(100), SkIntToScalar(100));
- canvas.drawOval(r, paint);
-
- SkImageEncoder* en = SkImageEncoder::Create(SkImageEncoder::kPNG_Type);
- en->encodeFile("testfile.png", bitmap);
- delete en;
- }
}
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y)