packages/x11/thunderbird/freetype6.patch

   1 --- ./gfx/src/x11shared/nsFontFreeType.cpp.orig 2004-07-24 02:02:30.000000000 +0200
   2 +++ ./gfx/src/x11shared/nsFontFreeType.cpp      2004-07-24 02:05:19.000000000 +0200
   3 @@ -177,7 +177,7 @@
   4    FTC_Manager mgr;
   5    nsresult rv;
   6    mFt2->GetFTCacheManager(&mgr);
   7 -  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
   8 +  rv = mFt2->ManagerLookupFace(mgr, &mImageDesc->face_id, &face);
   9    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
  10    if (NS_FAILED(rv))
  11      return nsnull;
  12 @@ -191,22 +191,15 @@
  13    PRBool embedded_bimap = PR_FALSE;
  14    mFaceID = aFaceID;
  15    mPixelSize = aPixelSize;
  16 -  mImageDesc.font.face_id    = (void*)mFaceID;
  17 -  mImageDesc.font.pix_width  = aPixelSize;
  18 -  mImageDesc.font.pix_height = aPixelSize;
  19 -  mImageDesc.image_type = 0;
  20 +  mImageDesc.->face_id    = (FTC_FaceID)mFaceID;
  21 +  mImageDesc->width  = aPixelSize;
  22 +  mImageDesc->height = aPixelSize;
  23 +  mImageDesc->flags = 0;
  24
  25    if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
  26 -    mImageDesc.image_type |= ftc_image_mono;
  27      anti_alias = PR_FALSE;
  28    }
  29
  30 -  if (nsFreeType2::gFreeType2Autohinted)
  31 -    mImageDesc.image_type |= ftc_image_flag_autohinted;
  32 -
  33 -  if (nsFreeType2::gFreeType2Unhinted)
  34 -    mImageDesc.image_type |= ftc_image_flag_unhinted;
  35 -
  36    PRUint32  num_embedded_bitmaps, i;
  37    PRInt32*  embedded_bitmapheights;
  38    mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
  39 @@ -218,7 +211,6 @@
  40          if (embedded_bitmapheights[i] == aPixelSize) {
  41            embedded_bimap = PR_TRUE;
  42            // unhinted must be set for embedded bitmaps to be used
  43 -          mImageDesc.image_type |= ftc_image_flag_unhinted;
  44            break;
  45          }
  46        }
  47 @@ -312,7 +304,7 @@
  48    if (!face)
  49      return NS_ERROR_FAILURE;
  50
  51 -  FTC_Image_Cache icache;
  52 +  FTC_ImageCache icache;
  53    mFt2->GetImageCache(&icache);
  54    if (!icache)
  55      return NS_ERROR_FAILURE;
  56 @@ -401,7 +393,7 @@
  57    if (!face)
  58      return 0;
  59
  60 -  FTC_Image_Cache icache;
  61 +  FTC_ImageCache icache;
  62    mFt2->GetImageCache(&icache);
  63    if (!icache)
  64      return 0;
  65 @@ -723,7 +715,7 @@
  66      if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
  67  #endif
  68
  69 -  FTC_Image_Cache icache;
  70 +  FTC_ImageCache icache;
  71    mFt2->GetImageCache(&icache);
  72    if (!icache)
  73      return 0;