From: Philipp Stephani <p.stephani2@gmail.com>
To: emacs-devel@gnu.org
Cc: Philipp Stephani <phst@google.com>
Subject: [PATCH 04/13] Use NSCharacterCollection instead of CTCharacterCollection
Date: Sat, 20 May 2017 16:58:32 +0200 [thread overview]
Message-ID: <20170520145841.94282-4-phst@google.com> (raw)
In-Reply-To: <20170520145841.94282-1-phst@google.com>
This should not cause behavior changes, but fixes a compiler warning
due to implicit conversions between the enums.
* src/macfont.m (macfont_cache, macfont_lookup_cache)
(macfont_get_glyph_for_cid, macfont_get_uvs_table)
(macfont_variation_glyphs): Use NSCharacterCollection.
---
src/macfont.m | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/macfont.m b/src/macfont.m
index f356842db1..b859eb4378 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -206,7 +206,7 @@ static void mac_font_get_glyphs_for_variants (CFDataRef, UTF32Char,
#if !USE_CT_GLYPH_INFO
static CGGlyph
-mac_font_get_glyph_for_cid (CTFontRef font, CTCharacterCollection collection,
+mac_font_get_glyph_for_cid (CTFontRef font, NSCharacterCollection collection,
CGFontIndex cid)
{
CGGlyph result = kCGFontIndexInvalid;
@@ -1321,8 +1321,8 @@ equal to the number of rows that are invalid as BMP (i.e., from
/* Character collection specifying the destination of the mapping
provided by `table' above. If `table' is obtained from the UVS
subtable in the font cmap table, then the value of this member
- should be kCTCharacterCollectionIdentityMapping. */
- CTCharacterCollection collection;
+ should be NSIdentityMappingCharacterCollection. */
+ NSCharacterCollection collection;
} uvs;
};
@@ -1333,8 +1333,8 @@ equal to the number of rows that are invalid as BMP (i.e., from
static CFCharacterSetRef macfont_get_cf_charset_for_name (CFStringRef);
static CGGlyph macfont_get_glyph_for_character (struct font *, UTF32Char);
static CGGlyph macfont_get_glyph_for_cid (struct font *font,
- CTCharacterCollection, CGFontIndex);
-static CFDataRef macfont_get_uvs_table (struct font *, CTCharacterCollection *);
+ NSCharacterCollection, CGFontIndex);
+static CFDataRef macfont_get_uvs_table (struct font *, NSCharacterCollection *);
static struct macfont_cache *
macfont_lookup_cache (CFStringRef key)
@@ -1582,7 +1582,7 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font,
}
static CGGlyph
-macfont_get_glyph_for_cid (struct font *font, CTCharacterCollection collection,
+macfont_get_glyph_for_cid (struct font *font, NSCharacterCollection collection,
CGFontIndex cid)
{
struct macfont_info *macfont_info = (struct macfont_info *) font;
@@ -1593,7 +1593,7 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font,
}
static CFDataRef
-macfont_get_uvs_table (struct font *font, CTCharacterCollection *collection)
+macfont_get_uvs_table (struct font *font, NSCharacterCollection *collection)
{
struct macfont_info *macfont_info = (struct macfont_info *) font;
CTFontRef macfont = macfont_info->macfont;
@@ -1603,12 +1603,12 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font,
if (cache->uvs.table == NULL)
{
CFDataRef uvs_table = mac_font_copy_uvs_table (macfont);
- CTCharacterCollection uvs_collection =
- kCTCharacterCollectionIdentityMapping;
+ NSCharacterCollection uvs_collection =
+ NSIdentityMappingCharacterCollection;
if (uvs_table == NULL
&& mac_font_get_glyph_for_cid (macfont,
- kCTCharacterCollectionAdobeJapan1,
+ NSAdobeJapan1CharacterCollection,
6480) != kCGFontIndexInvalid)
{
/* If the glyph for U+4E55 is accessible via its CID 6480,
@@ -1625,7 +1625,7 @@ static CGGlyph macfont_get_glyph_for_cid (struct font *font,
if (mac_uvs_table_adobe_japan1)
{
uvs_table = CFRetain (mac_uvs_table_adobe_japan1);
- uvs_collection = kCTCharacterCollectionAdobeJapan1;
+ uvs_collection = NSAdobeJapan1CharacterCollection;
}
}
if (uvs_table == NULL)
@@ -3348,7 +3348,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
macfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
{
CFDataRef uvs_table;
- CTCharacterCollection uvs_collection;
+ NSCharacterCollection uvs_collection;
int i, n = 0;
block_input ();
@@ -3368,7 +3368,7 @@ So we use CTFontDescriptorCreateMatchingFontDescriptor (no
{
CGGlyph glyph = glyphs[i];
- if (uvs_collection != kCTCharacterCollectionIdentityMapping
+ if (uvs_collection != NSIdentityMappingCharacterCollection
&& glyph != kCGFontIndexInvalid)
glyph = macfont_get_glyph_for_cid (font, uvs_collection, glyph);
if (glyph == kCGFontIndexInvalid)
--
2.13.0
next prev parent reply other threads:[~2017-05-20 14:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-20 14:58 [PATCH 01/13] Nextstep: Use instancetype explicit return type Philipp Stephani
2017-05-20 14:58 ` [PATCH 02/13] Declare Nextstep unexec functions in lisp.h Philipp Stephani
2017-05-20 14:58 ` [PATCH 03/13] Remove unused function print_regions Philipp Stephani
2017-05-20 14:58 ` Philipp Stephani [this message]
2017-05-20 14:58 ` [PATCH 05/13] Make a function static that isn't used outside this file Philipp Stephani
2017-05-20 14:58 ` [PATCH 06/13] Remove calls to deprecated setUsesScreenFonts Philipp Stephani
2017-05-20 14:58 ` [PATCH 07/13] Remove trailing semicolons in method definitions Philipp Stephani
2017-05-20 14:58 ` [PATCH 08/13] Nextstep: remove some deprecated method calls Philipp Stephani
2017-05-20 14:58 ` [PATCH 09/13] Nextstep: Replace deprecated enumerators Philipp Stephani
2017-05-20 14:58 ` [PATCH 10/13] Remove unused automatic variables Philipp Stephani
2017-05-20 14:58 ` [PATCH 11/13] Clean up code around 'ns-list-services' Philipp Stephani
2017-05-20 14:58 ` [PATCH 12/13] Fix call of registerServicesMenuSendTypes Philipp Stephani
2017-05-20 14:58 ` [PATCH 13/13] Avoid uninitialized read Philipp Stephani
2017-05-21 15:30 ` John Wiegley
2017-05-20 20:23 ` [PATCH 01/13] Nextstep: Use instancetype explicit return type Paul Eggert
2017-05-20 22:45 ` mituharu
2017-05-21 20:00 ` Philipp Stephani
2017-05-22 2:36 ` Paul Eggert
2017-05-22 19:21 ` [PATCH] Fix GNUstep build Alan Third
2017-05-23 9:46 ` Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170520145841.94282-4-phst@google.com \
--to=p.stephani2@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=phst@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).