diff options
| author | nyamatongwe <unknown> | 2011-07-11 15:40:24 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-07-11 15:40:24 +1000 |
| commit | 19b6c6abf5dc9386696681944b2ccef8cffe24fd (patch) | |
| tree | 160fbe29f74b74892833d2c58602f613deecf998 /cocoa/QuartzTextStyle.h | |
| parent | 2b14060f4c12bee171cf197c9ea0ae4094bdb1f4 (diff) | |
| download | scintilla-mirror-19b6c6abf5dc9386696681944b2ccef8cffe24fd.tar.gz | |
Fix memory leaks for font and color objects.
Diffstat (limited to 'cocoa/QuartzTextStyle.h')
| -rw-r--r-- | cocoa/QuartzTextStyle.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cocoa/QuartzTextStyle.h b/cocoa/QuartzTextStyle.h index 099684ca7..51d03cf91 100644 --- a/cocoa/QuartzTextStyle.h +++ b/cocoa/QuartzTextStyle.h @@ -16,7 +16,10 @@ public: QuartzTextStyle() { fontRef = NULL; - styleDict = CFDictionaryCreateMutable(NULL, 1, NULL, NULL); + styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + characterSet = 0; } @@ -27,6 +30,12 @@ public: CFRelease(styleDict); styleDict = NULL; } + + if (fontRef) + { + CFRelease(fontRef); + fontRef = NULL; + } } CFMutableDictionaryRef getCTStyle() const @@ -62,7 +71,9 @@ public: if (styleDict != NULL) CFRelease(styleDict); - styleDict = CFDictionaryCreateMutable(NULL, 1, NULL, NULL); + styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef); } |