diff options
Diffstat (limited to 'gm/etc1bitmap.cpp')
| -rw-r--r-- | gm/etc1bitmap.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp index fcf521a180..76593f4441 100644 --- a/gm/etc1bitmap.cpp +++ b/gm/etc1bitmap.cpp @@ -10,7 +10,7 @@ #include "Resources.h" #include "SkCanvas.h" #include "SkData.h" -#include "SkDecodingImageGenerator.h" +#include "SkImageGenerator.h" #include "SkImageDecoder.h" #include "SkOSFile.h" @@ -103,9 +103,7 @@ protected: return; } - if (!SkInstallDiscardablePixelRef( - SkDecodingImageGenerator::Create( - fileData, SkDecodingImageGenerator::Options()), &bm)) { + if (!SkInstallDiscardablePixelRef(fileData, &bm)) { SkDebugf("Could not install discardable pixel ref.\n"); return; } @@ -204,9 +202,7 @@ protected: size_t dataSz = etc1_get_encoded_data_size(width, height) + ETC_PKM_HEADER_SIZE; SkAutoDataUnref nonPOTData(SkData::NewWithCopy(am.get(), dataSz)); - if (!SkInstallDiscardablePixelRef( - SkDecodingImageGenerator::Create( - nonPOTData, SkDecodingImageGenerator::Options()), &bm)) { + if (!SkInstallDiscardablePixelRef(nonPOTData, &bm)) { SkDebugf("Could not install discardable pixel ref.\n"); return; } |