git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68855 954022d7-b5bf-4e40-9824-e11837661b57

Common/FontsFreeType/Private/FreeType/base.js

@@ -1029,7 +1029,7 @@ function ft_multo64(x, y, z)
     /* Check carry overflow of i1 + lo */
     lo += i1;
 
-    if (lo > FT_Common.a_i)
+    if (lo >= FT_Common.a_i)
         lo = FT_Common.IntToUInt(lo & 0xFFFFFFFF);
 
     if (lo < i1)

Common/FontsFreeType/Private/FreeType/drivers/ttinterp.js

@@ -1853,17 +1853,7 @@ function Move_Zp2_Point(exc, point, dx, dy, touch)
     // TODO: unpatented
     if (exc.GS.freeVector.x != 0)
     {
-        if (exc.face.driver.library.tt_hint_props.TT_CONFIG_OPTION_SUBPIXEL_HINTING) //#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-        {
-            if (!exc.ignore_x_mode || (exc.ignore_x_mode && (exc.sph_tweak_flags & FT_Common.SPH_TWEAK_ALLOW_X_MOVE_ZP2)))
-            {
-                exc.zp2.cur[exc.zp2._offset_cur + point].x += dx;
-            }
-        }
-        else
-        {
-            exc.zp2.cur[exc.zp2._offset_cur + point].x += dx;
-        }
+        exc.zp2.cur[exc.zp2._offset_cur + point].x += dx;
         if (touch)
             exc.zp2.tags[exc.zp2._offset_tags + point] |= FT_Common.FT_CURVE_TAG_TOUCH_X;
     }
@@ -6451,7 +6441,7 @@ function CSubpixHintingHacks()
         if ((loader.load_flags & FT_Common.FT_LOAD_NO_HINTING) == 0)
         {
             this.TWEAK_RULES(loader, glyph_index, this.TIMES_NEW_ROMAN_HACK_Rules, FT_Common.SPH_TWEAK_TIMES_NEW_ROMAN_HACK);
-            this.TWEAK_RULES(loader, glyph_index, this.COURIER_NEW_2_HACK_Rules, FT_Common.COURIER_NEW_2_HACK_Rules);
+            this.TWEAK_RULES(loader, glyph_index, this.COURIER_NEW_2_HACK_Rules, FT_Common.SPH_TWEAK_COURIER_NEW_2_HACK);
         }
 
         if (this.sph_test_tweak(face, face.family_name, loader.size.metrics.x_ppem, face.style_name, glyph_index, this.COMPATIBILITY_MODE_Rules, this.COMPATIBILITY_MODE_Rules.length))

Common/FontsFreeType/Private/FreeType/modules/render.js

@@ -444,7 +444,8 @@ function ft_trig_pseudo_polarize(vec)
         }
     }
 
-    arctanptr = 0;
+    var arctanptr = 0;
+    var i, b;
 
     /* Pseudorotations, with right shifts */
     for ( i = 1, b = 1; i < FT_Common.FT_TRIG_MAX_ITERS; b <<= 1, i++ )

Common/FontsFreeType/Private/generator/main.cpp

@@ -338,7 +338,8 @@ void GetConfigMap(std::vector<std::wstring>& _vec1, std::vector<std::wstring>& _
     _vec1.push_back(L"FT_Common.FT_SUBGLYPH_FLAG_USE_MY_METRICS"); _vec2.push_back(L"512");
     _vec1.push_back(L"FT_Common.FT_SUBGLYPH_FLAG_XY_SCALE"); _vec2.push_back(L"64");
     _vec1.push_back(L"FT_Common.FT_TRIG_MAX_ITERS"); _vec2.push_back(L"23");
-    _vec1.push_back(L"FT_Common.FT_TRIG_SCALE"); _vec2.push_back(L"2608131496");
+    _vec1.push_back(L"FT_Common.FT_TRIG_SAFE_MSB"); _vec2.push_back(L"29");
+    _vec1.push_back(L"FT_Common.FT_TRIG_SCALE"); _vec2.push_back(L"3688454934");
     _vec1.push_back(L"FT_Common.GX_TC_RESERVED_TUPLE_FLAGS"); _vec2.push_back(L"28672");
     _vec1.push_back(L"FT_Common.GX_TC_TUPLES_SHARE_POINT_NUMBERS"); _vec2.push_back(L"32768");
     _vec1.push_back(L"FT_Common.GX_TC_TUPLE_COUNT_MASK"); _vec2.push_back(L"4095");