ApwFreetypeLibrary

Check-in [7af4a1e516]
Login

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

Overview
Comment:fixes.
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA1:7af4a1e5161b845e83287a3f9171f7cefa15f617
User & Date: arnulf 2015-01-02 10:59:01
Context
2015-01-02
10:59
fixes. Leaf check-in: 7af4a1e516 user: arnulf tags: trunk
2014-12-31
14:38
initial version. check-in: 7dfcd6bfd2 user: arnulf tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ftsfnt/TTLoad.java.

272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
     * tt_face_load_font_dir
     * =====================================================================
     */
    public static int tt_face_load_font_dir(Object... args) {
Debug(0, DBG_LOAD_GLYPH, TAG, "tt_face_load_font_dir called");
      int error = 0;
      fttruetype.TTTableRec entry;
        fttruetype.TTFaceRec face = (fttruetype.TTFaceRec) args[0];
      ftbase.FTStreamRec stream = (ftbase.FTStreamRec) args[1];
      SFNTHeaderRec sfnt = new SFNTHeaderRec(stream);
      ftbase.FTReference<SFNTHeaderRec> sfnt_ref = new ftbase.FTReference<SFNTHeaderRec>();
      /* load the table directory */
      ftbase.FTTrace.Trace(7, TAG, String.format("-- Number of tables: %10d", sfnt.num_tables));
      ftbase.FTTrace.Trace(7, TAG, String.format("-- Format version:   0x%08x", sfnt.format_tag));
      if (sfnt.format_tag != TTSfntLoad.TTAG_OTTO) {







|







272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
     * tt_face_load_font_dir
     * =====================================================================
     */
    public static int tt_face_load_font_dir(Object... args) {
Debug(0, DBG_LOAD_GLYPH, TAG, "tt_face_load_font_dir called");
      int error = 0;
      fttruetype.TTTableRec entry;
      fttruetype.TTFaceRec face = (fttruetype.TTFaceRec) args[0];
      ftbase.FTStreamRec stream = (ftbase.FTStreamRec) args[1];
      SFNTHeaderRec sfnt = new SFNTHeaderRec(stream);
      ftbase.FTReference<SFNTHeaderRec> sfnt_ref = new ftbase.FTReference<SFNTHeaderRec>();
      /* load the table directory */
      ftbase.FTTrace.Trace(7, TAG, String.format("-- Number of tables: %10d", sfnt.num_tables));
      ftbase.FTTrace.Trace(7, TAG, String.format("-- Format version:   0x%08x", sfnt.format_tag));
      if (sfnt.format_tag != TTSfntLoad.TTAG_OTTO) {

Changes to ftsfnt/TTSfntLoad.java.

130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163

      ftbase.FTStreamRec stream = (ftbase.FTStreamRec)args[0];
      TTFaceRec face = (TTFaceRec)args[1];
      Long val1 = (Long)args[2];
      int face_index = val1.intValue();
      val1 = (Long)args[3];
      int num_params = val1.intValue();
        ftbase.FTParameter params = (ftbase.FTParameter)args[4];
      int error = 0;
      ftbase.FTLibraryRec library = face.driver.library;
      FTSfntInterfaceClass sfnt;

      if (num_params != 0) ; // unused
      if (params == null) ;  // unused
Debug(0, DBG_INIT, TAG, "sfnt_init_face called: "+face_index+"!"+face.sfnt+"!");
................................................................................
            ftbase.FTTrace.Trace(7, TAG, "sfnt_init_face: cannot access `sfnt' module");
          return ftbase.FTError.INTERP_MISSING_MODULE;
        }
        face.sfnt = sfnt;
        face.goto_table = sfnt.goto_table;
      }
//      FT_FACE_FIND_GLOBAL_SERVICE(face, face.psnames, POSTSCRIPT_CMAPS);
        ftbase.FTTrace.Trace(7, TAG, "SFNT driver" );
      error = sfnt_open_font(stream, face);
      if (error != 0) {
        return error;
      }
      ftbase.FTTrace.Trace(7, TAG, "sfnt_init_face: "+face+"!"+face_index);
      if (face_index < 0) {
        face_index = 0;







|







 







|







130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163

      ftbase.FTStreamRec stream = (ftbase.FTStreamRec)args[0];
      TTFaceRec face = (TTFaceRec)args[1];
      Long val1 = (Long)args[2];
      int face_index = val1.intValue();
      val1 = (Long)args[3];
      int num_params = val1.intValue();
      ftbase.FTParameter params = (ftbase.FTParameter)args[4];
      int error = 0;
      ftbase.FTLibraryRec library = face.driver.library;
      FTSfntInterfaceClass sfnt;

      if (num_params != 0) ; // unused
      if (params == null) ;  // unused
Debug(0, DBG_INIT, TAG, "sfnt_init_face called: "+face_index+"!"+face.sfnt+"!");
................................................................................
            ftbase.FTTrace.Trace(7, TAG, "sfnt_init_face: cannot access `sfnt' module");
          return ftbase.FTError.INTERP_MISSING_MODULE;
        }
        face.sfnt = sfnt;
        face.goto_table = sfnt.goto_table;
      }
//      FT_FACE_FIND_GLOBAL_SERVICE(face, face.psnames, POSTSCRIPT_CMAPS);
      ftbase.FTTrace.Trace(7, TAG, "SFNT driver" );
      error = sfnt_open_font(stream, face);
      if (error != 0) {
        return error;
      }
      ftbase.FTTrace.Trace(7, TAG, "sfnt_init_face: "+face+"!"+face_index);
      if (face_index < 0) {
        face_index = 0;