Subversion Repositories tpanel

Rev

Rev 21 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 21 Rev 23
Line 180... Line 180...
180 
 
 180 
 
181 
bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst)
 181 
bool DecodeDataToBitmap(sk_sp<SkData> data, SkBitmap* dst)
182 
{
 182 
{
183 
    std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data)));
 183 
    std::unique_ptr<SkImageGenerator> gen(SkImageGenerator::MakeFromEncoded(std::move(data)));
184 
    return gen && dst->tryAllocPixels(gen->getInfo()) &&
 184 
    return gen && dst->tryAllocPixels(gen->getInfo()) &&
- 
 
 185 
#ifdef __ANDROID__
- 
 
 186 
    gen->getPixels(gen->getInfo().makeColorType(kBGRA_8888_SkColorType).makeAlphaType(kPremul_SkAlphaType), dst->getPixels(), dst->rowBytes());
- 
 
 187 
#else
185 
    gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes());
 188 
    gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes());
- 
 
 189 
#endif
186 
}
 190 
}
187 
 
 191 
 
188 
std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource)
 192 
std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource)
189 
{
 193 
{
190 
    sk_sp<SkData> data = GetResourceAsData(resource);
 194 
    sk_sp<SkData> data = GetResourceAsData(resource);