git-svn-id: http://skia.googlecode.com/svn/trunk@540 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2010-04-12 20:16:49 +00:00
Родитель 6413e79414
Коммит 1c0c5a0a52
1 изменённых файлов: 4 добавлений и 3 удалений

Просмотреть файл

@ -283,10 +283,11 @@ public:
StreamTypeface(Style style, bool sysFont, FamilyRec* family,
SkStream* stream)
: INHERITED(style, sysFont, family) {
stream->ref();
fStream = stream;
}
virtual ~StreamTypeface() {
SkDELETE(fStream);
fStream->unref();
}
// overrides
@ -536,8 +537,8 @@ SkStream* SkFontHost::OpenStream(uint32_t fontID) {
FamilyTypeface* tf = (FamilyTypeface*)find_from_uniqueID(fontID);
SkStream* stream = tf ? tf->openStream() : NULL;
if (NULL == stream || stream->getLength() == 0) {
delete stream;
if (stream && stream->getLength() == 0) {
stream->unref();
stream = NULL;
}
return stream;