Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(980)

Unified Diff: src/images/SkImageEncoder.cpp

Issue 1018953003: Add SkEncodedFormat, used by SkCodec. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Use a common enum for SkImageEncoder and SkImageDecoder and SkCodec Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/images/SkImageEncoder.cpp
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index a6f109a207102de44368fa74a3271f2072c6c446..c8deff391417a18dce2194ef5a1db944ecbfed8a 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -34,25 +34,26 @@ SkData* SkImageEncoder::encodeData(const SkBitmap& bm, int quality) {
return NULL;
}
-bool SkImageEncoder::EncodeFile(const char file[], const SkBitmap& bm, Type t,
- int quality) {
+bool SkImageEncoder::EncodeFile(const char file[], const SkBitmap& bm,
+ SkEncodedFormat t, int quality) {
SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
return enc.get() && enc.get()->encodeFile(file, bm, quality);
}
-bool SkImageEncoder::EncodeStream(SkWStream* stream, const SkBitmap& bm, Type t,
- int quality) {
+bool SkImageEncoder::EncodeStream(SkWStream* stream, const SkBitmap& bm,
+ SkEncodedFormat t, int quality) {
SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
return enc.get() && enc.get()->encodeStream(stream, bm, quality);
}
-SkData* SkImageEncoder::EncodeData(const SkBitmap& bm, Type t, int quality) {
+SkData* SkImageEncoder::EncodeData(const SkBitmap& bm, SkEncodedFormat t,
+ int quality) {
SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
return enc.get() ? enc.get()->encodeData(bm, quality) : NULL;
}
SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels, size_t rowBytes,
- Type t, int quality) {
+ SkEncodedFormat t, int quality) {
SkBitmap bm;
if (!bm.installPixels(info, const_cast<void*>(pixels), rowBytes)) {
return NULL;

Powered by Google App Engine
This is Rietveld 408576698