AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

expose skdata -> cgdataprovider helper

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8374 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-03-25 20:15:40 +00:00
parent 2874906bf2
commit 12b1f19c1f
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/mac/SkCGUtils.h
View File

@ -19,6 +19,7 @@
#endif
class SkBitmap;
class SkData;
class SkStream;
/**
@ -60,5 +61,6 @@ bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output);
* Now when the provider is finally deleted, it will delete the stream.
*/
CGDataProviderRef SkCreateDataProviderFromStream(SkStream*);
CGDataProviderRef SkCreateDataProviderFromStream(SkData*);
#endif

19
src/utils/mac/SkStream_mac.cpp
View File

@ -10,7 +10,7 @@
// This is used by CGDataProviderCreateWithData
static void unref_data_proc(void* info, const void* addr, size_t size) {
static void unref_proc(void* info, const void* addr, size_t size) {
SkASSERT(info);
((SkRefCnt*)info)->unref();
}
@ -38,14 +38,14 @@ static void release_info_proc(void* info) {
CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
stream->ref(); // unref will be called when the provider is deleted
const void* addr = stream->getMemoryBase();
if (addr) {
// special-case when the stream is just a block of ram
return CGDataProviderCreateWithData(stream, addr, stream->getLength(),
unref_data_proc);
unref_proc);
}
CGDataProviderSequentialCallbacks rec;
sk_bzero(&rec, sizeof(rec));
rec.version = 0;
@ -55,3 +55,14 @@ CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
rec.releaseInfo = release_info_proc;
return CGDataProviderCreateSequential(stream, &rec);
}
///////////////////////////////////////////////////////////////////////////////
#include "SkData.h"
CGDataProviderRef SkCreateDataProviderFromStream(SkData* data) {
data->ref();
return CGDataProviderCreateWithData(data, data->data(), data->size(),
unref_proc);
}