Changeset 479 for trunk


Ignore:
Timestamp:
Mar 31, 2011, 4:08:18 PM (10 years ago)
Author:
Silvan Scherrer
Message:

freeetype: merged with mozilla freetype

Location:
trunk/poppler/freetype2/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/freetype2/src/base/ftoutln.c

    r470 r479  
    958958
    959959        outline->points[n].x = v_cur.x + strength + in.x;
     960#ifdef __OS2__
     961        outline->points[n].y = v_cur.y;
     962#else
    960963        outline->points[n].y = v_cur.y + strength + in.y;
     964#endif
    961965
    962966        v_prev = v_cur;
  • trunk/poppler/freetype2/src/base/ftsynth.c

    r470 r479  
    9494      return;
    9595
     96#ifdef __OS2__
     97    /* some reasonable strength,, PmW make 1px expand to 2px */
     98    xstr = FT_MulFix( face->units_per_EM,
     99                      face->size->metrics.y_scale ) / 16;
     100    ystr = 0;
     101#else
    96102    /* some reasonable strength */
    97103    xstr = FT_MulFix( face->units_per_EM,
    98104                      face->size->metrics.y_scale ) / 24;
    99105    ystr = xstr;
     106#endif
    100107
    101108    if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
     
    107114      /* values, you have to call FT_Outline_Get_CBox                   */
    108115      xstr = xstr * 2;
     116#ifndef __OS2__
    109117      ystr = xstr;
     118#endif
    110119    }
    111120    else /* slot->format == FT_GLYPH_FORMAT_BITMAP */
  • trunk/poppler/freetype2/src/sfnt/sfobjs.c

    r470 r479  
    740740    if ( face->os2.version != 0xFFFFU && face->os2.fsSelection & 256 )
    741741    {
     742#ifndef __OS2__ /* PmW: don't use the preferred properties on OS/2 */
    742743      if ( !ignore_preferred_family )
    743744        GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
    744745      if ( !face->root.family_name )
     746#endif
    745747        GET_NAME( FONT_FAMILY, &face->root.family_name );
    746748
     749#ifndef __OS2__ /* PmW: don't use the preferred properties on OS/2 */
    747750      if ( !ignore_preferred_subfamily )
    748751        GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
    749752      if ( !face->root.style_name )
     753#endif
    750754        GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
    751755    }
Note: See TracChangeset for help on using the changeset viewer.