walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[dwrite] Delete remained objects 

No longer noticeable memory increase on create/destroy iterations,
highly better than current state of uniscribe backend
This commit is contained in:
Ebrahim Byagowi 2016-06-24 12:23:25 +04:30
parent be565d1714
commit 07b724f341
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/hb-directwrite.cc
View File

@ -130,11 +130,12 @@ public:
*/ */
struct hb_directwrite_shaper_face_data_t { struct hb_directwrite_shaper_face_data_t {
IDWriteFactory* dwriteFactory; IDWriteFactory *dwriteFactory;
IDWriteFontFile* fontFile; IDWriteFontFile *fontFile;
IDWriteFontFileLoader* fontFileLoader; IDWriteFontFileStream *fontFileStream;
IDWriteFontFace* fontFace; IDWriteFontFileLoader *fontFileLoader;
hb_blob_t* faceBlob; IDWriteFontFace *fontFace;
hb_blob_t *faceBlob;
}; };
hb_directwrite_shaper_face_data_t * hb_directwrite_shaper_face_data_t *
@ -195,6 +196,7 @@ _hb_directwrite_shaper_face_data_create(hb_face_t *face)
data->dwriteFactory = dwriteFactory; data->dwriteFactory = dwriteFactory;
data->fontFile = fontFile; data->fontFile = fontFile;
data->fontFileStream = fontFileStream;
data->fontFileLoader = fontFileLoader; data->fontFileLoader = fontFileLoader;
data->fontFace = fontFace; data->fontFace = fontFace;
data->faceBlob = blob; data->faceBlob = blob;
@ -205,10 +207,23 @@ _hb_directwrite_shaper_face_data_create(hb_face_t *face)
void void
_hb_directwrite_shaper_face_data_destroy(hb_directwrite_shaper_face_data_t *data) _hb_directwrite_shaper_face_data_destroy(hb_directwrite_shaper_face_data_t *data)
{ {
data->dwriteFactory->UnregisterFontFileLoader (data->fontFileLoader); if (data->fontFace)
delete data->fontFileLoader; data->fontFace->Release ();
hb_blob_destroy (data->faceBlob); if (data->fontFile)
free (data); data->fontFile->Release ();
if (data->dwriteFactory) {
if (data->fontFileLoader)
data->dwriteFactory->UnregisterFontFileLoader(data->fontFileLoader);
data->dwriteFactory->Release();
}
if (data->fontFileLoader)
delete data->fontFileLoader;
if (data->fontFileStream)
delete data->fontFileStream;
if (data->faceBlob)
hb_blob_destroy (data->faceBlob);
if (data)
free (data);
} }