summaryrefslogtreecommitdiff
path: root/cocoa/font.m
diff options
context:
space:
mode:
authorSven Weidauer <sven.weidauer@gmail.com>2011-01-31 07:57:52 +0000
committerSven Weidauer <sven.weidauer@gmail.com>2011-01-31 07:57:52 +0000
commitfd23621211e814d86da1a12bf0f5a20368d4c037 (patch)
treef84c9dff108c49034c86dbdfd8d8b428d6ab4fb3 /cocoa/font.m
parentb1662d0b09963c0d86b417f6acb2ce4c6b9a15dd (diff)
downloadnetsurf-fd23621211e814d86da1a12bf0f5a20368d4c037.tar.gz
netsurf-fd23621211e814d86da1a12bf0f5a20368d4c037.tar.bz2
Changing Xcode project file to build using the Makefiles and fixed some warnings.
svn path=/trunk/netsurf/; revision=11558
Diffstat (limited to 'cocoa/font.m')
-rw-r--r--cocoa/font.m3
1 files changed, 1 insertions, 2 deletions
diff --git a/cocoa/font.m b/cocoa/font.m
index 795b04802..a0298b997 100644
--- a/cocoa/font.m
+++ b/cocoa/font.m
@@ -37,7 +37,6 @@ static CGFloat cocoa_layout_width( NSLayoutManager *layout );
static CGFloat cocoa_layout_width_chars( NSLayoutManager *layout, size_t characters );
static NSUInteger cocoa_glyph_for_location( NSLayoutManager *layout, CGFloat x );
static size_t cocoa_bytes_for_characters( const char *string, size_t characters );
-static NSString *cocoa_string_from_utf8_characters( const char *string, size_t characters );
static NSDictionary *cocoa_font_attributes( const plot_font_style_t *style );
static NSTextStorage *cocoa_text_storage = nil;
@@ -185,7 +184,7 @@ static NSLayoutManager *cocoa_prepare_layout_manager( const char *bytes, size_t
}
static NSString *oldString = 0;
- static plot_font_style_t oldStyle = { 0 };
+ static plot_font_style_t oldStyle = { 0, 0, 0, 0, 0, 0 };
const bool styleChanged = memcmp( style, &oldStyle, sizeof oldStyle ) != 0;