add optional Format* parameter to decoder helper functions.
git-svn-id: http://skia.googlecode.com/svn/trunk@215 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 1800eb9..e181870 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -31,12 +31,12 @@
for (int i = 0; i < fBitmapCount/2; i++) {
SkImageDecoder::DecodeFile(gNames[i], &fBitmaps[i],
SkBitmap::kARGB_8888_Config,
- SkImageDecoder::kDecodePixels_Mode);
+ SkImageDecoder::kDecodePixels_Mode, NULL);
}
for (int i = fBitmapCount/2; i < fBitmapCount; i++) {
SkImageDecoder::DecodeFile(gNames[i-fBitmapCount/2], &fBitmaps[i],
SkBitmap::kRGB_565_Config,
- SkImageDecoder::kDecodePixels_Mode);
+ SkImageDecoder::kDecodePixels_Mode, NULL);
}
fCurrIndex = 0;
}
diff --git a/samplecode/SampleImage.cpp b/samplecode/SampleImage.cpp
index 7683e63..69cbd79 100644
--- a/samplecode/SampleImage.cpp
+++ b/samplecode/SampleImage.cpp
@@ -27,7 +27,7 @@
SkBitmap::Config pref, const char name[] = NULL)
{
if (SkImageDecoder::DecodeStream(stream, bitmap, pref,
- SkImageDecoder::kDecodeBounds_Mode)) {
+ SkImageDecoder::kDecodeBounds_Mode, NULL)) {
SkASSERT(bitmap->config() != SkBitmap::kNo_Config);
SkImageRef* ref = new SkImageRef_GlobalPool(stream, bitmap->config());