Check-in [f33cd260bb]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:freetype compile fixes for Android platform
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f33cd260bb9c9744e0ac1724959406cf50253929
User & Date: chw 2016-11-08 06:21:55
Context
2016-11-09
17:04
add selected tk upstream changes check-in: 15c0773415 user: chw tags: trunk
2016-11-08
06:21
freetype compile fixes for Android platform check-in: f33cd260bb user: chw tags: trunk
04:45
add tk upstream changes check-in: 6bc023fba0 user: chw tags: trunk
Changes

Changes to jni/freetype/src/base/ftmac.c.

15
16
17
18
19
20
21

22
23
24
25
26
27
28
....
1072
1073
1074
1075
1076
1077
1078

1079
1080
/*  modified, and distributed under the terms of the FreeType project      */
/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
/*  this file you indicate that you have read the license and              */
/*  understand and accept it fully.                                        */
/*                                                                         */
/***************************************************************************/



  /*
    Notes

    Mac suitcase files can (and often do!) contain multiple fonts.  To
    support this I use the face_index argument of FT_(Open|New)_Face()
    functions, and pretend the suitcase file is a collection.
................................................................................
    else
      return FT_New_Face_From_FSRef( library, &ref, face_index, aface );
#endif
  }

#endif /* FT_MACINTOSH */



/* END */







>







 







>


15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
....
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
/*  modified, and distributed under the terms of the FreeType project      */
/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
/*  this file you indicate that you have read the license and              */
/*  understand and accept it fully.                                        */
/*                                                                         */
/***************************************************************************/

#ifdef __APPLE__

  /*
    Notes

    Mac suitcase files can (and often do!) contain multiple fonts.  To
    support this I use the face_index argument of FT_(Open|New)_Face()
    functions, and pretend the suitcase file is a collection.
................................................................................
    else
      return FT_New_Face_From_FSRef( library, &ref, face_index, aface );
#endif
  }

#endif /* FT_MACINTOSH */

#endif /* __APPLE__ */

/* END */

Changes to jni/freetype/src/gxvalid/gxvfgen.c.

38
39
40
41
42
43
44

45
46
47
48
49
50
51
...
475
476
477
478
479
480
481

482
483
/***************************************************************************/
/*                                                                         */
/* Development of gxfeatreg.c is supported by                              */
/* Information-technology Promotion Agency, Japan.                         */
/*                                                                         */
/***************************************************************************/



/***************************************************************************/
/*                                                                         */
/* This file is compiled as a stand-alone executable.                      */
/* This file is never compiled into `libfreetype2'.                        */
/* The output of this file is used in `gxvfeat.c'.                         */
/* ----------------------------------------------------------------------- */
................................................................................
    }

    printf( "  };\n" );

    return 0;
  }



/* END */







>







 







>


38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
...
476
477
478
479
480
481
482
483
484
485
/***************************************************************************/
/*                                                                         */
/* Development of gxfeatreg.c is supported by                              */
/* Information-technology Promotion Agency, Japan.                         */
/*                                                                         */
/***************************************************************************/

#ifndef FT2_BUILD_LIBRARY

/***************************************************************************/
/*                                                                         */
/* This file is compiled as a stand-alone executable.                      */
/* This file is never compiled into `libfreetype2'.                        */
/* The output of this file is used in `gxvfeat.c'.                         */
/* ----------------------------------------------------------------------- */
................................................................................
    }

    printf( "  };\n" );

    return 0;
  }

#endif /* FT2_BUILD_LIBRARY */

/* END */