[mapguide-commits] r8746 - in sandbox/VC140/Oem/gd/freetype: include/freetype src/base

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2015-08-17 20:11:45 -0700 (Mon, 17 Aug 2015)
New Revision: 8746

Modified:
   sandbox/VC140/Oem/gd/freetype/include/freetype/freetype.h
   sandbox/VC140/Oem/gd/freetype/src/base/ftobjs.c
Log:
RFC 150: MapGuide RFC 150 - Support Visual Studio 2015 
http://trac.osgeo.org/mapguide/wiki/MapGuideRfc150

Fix build error due to Freetype uses "generic" as variable name, which conflicts with keyword "generic". Fix it by rename Freetype to another variable name. 

Modified: sandbox/VC140/Oem/gd/freetype/include/freetype/freetype.h
===================================================================
--- sandbox/VC140/Oem/gd/freetype/include/freetype/freetype.h	2015-08-17 10:03:07 UTC (rev 8745)
+++ sandbox/VC140/Oem/gd/freetype/include/freetype/freetype.h	2015-08-18 03:11:45 UTC (rev 8746)
@@ -911,7 +911,7 @@
     FT_Int            num_charmaps;
     FT_CharMap*       charmaps;
 
-    FT_Generic        generic;
+    FT_Generic        genericFT;
 
     /*# The following member variables (down to `underline_thickness') */
     /*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size    */
@@ -1312,7 +1312,7 @@
   typedef struct  FT_SizeRec_
   {
     FT_Face           face;      /* parent face object              */
-    FT_Generic        generic;   /* generic pointer for client uses */
+    FT_Generic        genericFT;   /* generic pointer for client uses */
     FT_Size_Metrics   metrics;   /* size metrics                    */
     FT_Size_Internal  internal;
 
@@ -1520,7 +1520,7 @@
     FT_Face           face;
     FT_GlyphSlot      next;
     FT_UInt           reserved;       /* retained for binary compatibility */
-    FT_Generic        generic;
+    FT_Generic        genericFT;
 
     FT_Glyph_Metrics  metrics;
     FT_Fixed          linearHoriAdvance;

Modified: sandbox/VC140/Oem/gd/freetype/src/base/ftobjs.c
===================================================================
--- sandbox/VC140/Oem/gd/freetype/src/base/ftobjs.c	2015-08-17 10:03:07 UTC (rev 8745)
+++ sandbox/VC140/Oem/gd/freetype/src/base/ftobjs.c	2015-08-18 03:11:45 UTC (rev 8746)
@@ -764,8 +764,8 @@
                 FT_Driver  driver )
   {
     /* finalize client-specific data */
-    if ( size->generic.finalizer )
-      size->generic.finalizer( size );
+    if ( size->genericFT.finalizer )
+      size->genericFT.finalizer( size );
 
     /* finalize format-specific stuff */
     if ( driver->clazz->done_size )
@@ -831,8 +831,8 @@
     face->size = 0;
 
     /* now discard client data */
-    if ( face->generic.finalizer )
-      face->generic.finalizer( face );
+    if ( face->genericFT.finalizer )
+      face->genericFT.finalizer( face );
 
     /* discard charmaps */
     destroy_charmaps( face, memory );