From 0a7e6c5856b26fb5d74919bceb2778fe5c0dc713 Mon Sep 17 00:00:00 2001
From: Teemu Katajisto <teemu.katajisto@digia.com>
Date: Thu, 18 Oct 2012 11:02:33 +0300
Subject: Cocoa: fix coretext memory leaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id85dbf8a2ea8994d9fca07d3f10b43f62ec305a0
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 ++
 src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 0cc69d129c..8306a47e4f 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -149,6 +149,7 @@ QCoreTextFontDatabase::QCoreTextFontDatabase()
         // layout of the primary display
         NSDictionary *d = (NSDictionary *) IODisplayCreateInfoDictionary(iodisplay, kIODisplayOnlyPreferredName);
         uint displaySubpixelLayout = [[d objectForKey:@kDisplaySubPixelLayout] unsignedIntValue];
+        [d release];
         font_smoothing = (displaySubpixelLayout == kDisplaySubPixelLayoutUndefined ? 0 : 1);
 
         [pool release];
@@ -382,6 +383,7 @@ QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData
                     NSLog(@"Unable to register font: %@", error);
                     CFRelease(error);
                 }
+                CGFontRelease(cgFont);
             }
         } else {
             CFErrorRef error;
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index c453cb7d1b..d989de0abb 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -501,6 +501,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
     }
 
     CGContextRelease(ctx);
+    CGColorSpaceRelease(colorspace);
 
     return im;
 }
-- 
cgit v1.2.3