Subversion Repositories tpanel

Rev

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

Rev 361 Rev 365
Line 32... Line 32...
32 
 
 32 
 
33 
#ifdef __MACH__
 33 
#ifdef __MACH__
34 
#include <skia/core/SkImage.h>
 34 
#include <skia/core/SkImage.h>
35 
#include <skia/core/SkString.h>
 35 
#include <skia/core/SkString.h>
36 
#include <skia/core/SkData.h>
 36 
#include <skia/core/SkData.h>
- 
 
 37 
#include <skia/core/SkColor.h>
37 
#else
 38 
#else
38 
#include <include/core/SkImage.h>
 39 
#include <include/core/SkImage.h>
39 
#include <include/core/SkString.h>
 40 
#include <include/core/SkString.h>
40 
#include <include/core/SkData.h>
 41 
#include <include/core/SkData.h>
- 
 
 42 
#include <include/core/SkColor.h>
41 
#endif
 43 
#endif
42 
 
 44 
 
43 
//#include "terror.h"
 45 
//#include "terror.h"
44 
 
 46 
 
45 
#ifndef ulong
 47 
#ifndef ulong
Line 78... Line 80...
78 
    return DecodeDataToBitmap(GetResourceAsData(resource), dst);
 80 
    return DecodeDataToBitmap(GetResourceAsData(resource), dst);
79 
}
 81 
}
80 
 
 82 
 
81 
inline sk_sp<SkImage> GetResourceAsImage(const char* resource)
 83 
inline sk_sp<SkImage> GetResourceAsImage(const char* resource)
82 
{
 84 
{
83 
    return SkImage::MakeFromEncoded(GetResourceAsData(resource));
 85 
    return SkImages::DeferredFromEncodedData(GetResourceAsData(resource));
84 
}
 86 
}
85 
 
 87 
 
86 
std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource, _RESOURCE_TYPE rs = RESTYPE_IMAGE);
 88 
std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource, _RESOURCE_TYPE rs = RESTYPE_IMAGE);
87 
 
 89 
 
88 
sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource, int ttcIndex = 0, _RESOURCE_TYPE rs = RESTYPE_FONT);
 90 
sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource, int ttcIndex = 0, _RESOURCE_TYPE rs = RESTYPE_FONT);