use non-deprecated encoding ids for freetype 2

diff --git a/FT2/Changes b/FT2/Changes
index de2ee1c4406dcdc495b150e6057d1e48f32c7eed..3a90e7448466579fc9fbbd2697dbf0d31bde7609 100644 (file)
--- a/FT2/Changes
+++ b/FT2/Changes
@@ -1,3 +1,9 @@
+Imager-Font-FT2 0.97
+====================
+
+ - use undeprecated encoding symbols.  This may fix the build on the
+   badly patched CentOS 7 Freetype 2.
+

 Imager-Font-FT2 0.96
 ====================
 
 Imager-Font-FT2 0.96
 ====================
 

diff --git a/FT2/FT2.pm b/FT2/FT2.pm
index 93cd707fbf0767a6fc7622952c8316b25efd06aa..074ddb5affe6d42c96b09e59ce52277fb80f0aaa 100644 (file)
--- a/FT2/FT2.pm
+++ b/FT2/FT2.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "0.96";
+  $VERSION = "0.97";

 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);

diff --git a/FT2/freetyp2.c b/FT2/freetyp2.c
index 6ee45d7973e12de78c984149675cd483216f8d7c..87d5e5710f9c2f2254eeea0f4e11c653b5924a0e 100644 (file)
--- a/FT2/freetyp2.c
+++ b/FT2/freetyp2.c
@@ -187,16 +187,16 @@ static struct enc_score {
   /* the selections here are fairly arbitrary
      ideally we need to give the user a list of encodings available
      and a mechanism to choose one */
   /* the selections here are fairly arbitrary
      ideally we need to give the user a list of encodings available
      and a mechanism to choose one */

-  { ft_encoding_unicode,        10 },
-  { ft_encoding_sjis,            8 },
-  { ft_encoding_gb2312,          8 },
-  { ft_encoding_big5,            8 },
-  { ft_encoding_wansung,         8 },
-  { ft_encoding_johab,           8 },  
-  { ft_encoding_latin_2,         6 },
-  { ft_encoding_apple_roman,     6 },
-  { ft_encoding_adobe_standard,  6 },
-  { ft_encoding_adobe_expert,    6 },
+  { FT_ENCODING_UNICODE,        10 },
+  { FT_ENCODING_MS_SJIS,         8 },
+  { FT_ENCODING_MS_GB2312,       8 },
+  { FT_ENCODING_MS_BIG5,         8 },
+  { FT_ENCODING_MS_WANSUNG,      8 },
+  { FT_ENCODING_MS_JOHAB,        8 },
+  { FT_ENCODING_OLD_LATIN_2,     6 },
+  { FT_ENCODING_APPLE_ROMAN,     6 },
+  { FT_ENCODING_ADOBE_STANDARD,  6 },
+  { FT_ENCODING_ADOBE_EXPERT,    6 },

 };
 
 /*
 };
 
 /*