Changeset 479 for trunk

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:

• base/ftoutln.c (modified) (1 diff)
• base/ftsynth.c (modified) (2 diffs)
• sfnt/sfobjs.c (modified) (1 diff)

trunk/poppler/freetype2/src/base/ftoutln.c

@@ -958 +958 @@
 
         outline->points[n].x = v_cur.x + strength + in.x;
+#ifdef __OS2__
+        outline->points[n].y = v_cur.y;
+#else
         outline->points[n].y = v_cur.y + strength + in.y;
+#endif
 
         v_prev = v_cur;

trunk/poppler/freetype2/src/base/ftsynth.c

@@ -94 +94 @@
       return;
 
+#ifdef __OS2__
+    /* some reasonable strength,, PmW make 1px expand to 2px */
+    xstr = FT_MulFix( face->units_per_EM,
+                      face->size->metrics.y_scale ) / 16;
+    ystr = 0;
+#else
     /* some reasonable strength */
     xstr = FT_MulFix( face->units_per_EM,
                       face->size->metrics.y_scale ) / 24;
     ystr = xstr;
+#endif
 
     if ( slot->format == FT_GLYPH_FORMAT_OUTLINE )
@@ -107 +114 @@
       /* values, you have to call FT_Outline_Get_CBox                   */
       xstr = xstr * 2;
+#ifndef __OS2__
       ystr = xstr;
+#endif
     }
     else /* slot->format == FT_GLYPH_FORMAT_BITMAP */

trunk/poppler/freetype2/src/sfnt/sfobjs.c

@@ -740 +740 @@
     if ( face->os2.version != 0xFFFFU && face->os2.fsSelection & 256 )
     {
+#ifndef __OS2__ /* PmW: don't use the preferred properties on OS/2 */
       if ( !ignore_preferred_family )
         GET_NAME( PREFERRED_FAMILY, &face->root.family_name );
       if ( !face->root.family_name )
+#endif
         GET_NAME( FONT_FAMILY, &face->root.family_name );
 
+#ifndef __OS2__ /* PmW: don't use the preferred properties on OS/2 */
       if ( !ignore_preferred_subfamily )
         GET_NAME( PREFERRED_SUBFAMILY, &face->root.style_name );
       if ( !face->root.style_name )
+#endif
         GET_NAME( FONT_SUBFAMILY, &face->root.style_name );
     }