Ignore:
Timestamp:
Mar 6, 2011, 12:41:38 AM (10 years ago)
Author:
Silvan Scherrer
Message:

poppler, jpeg, freetype lib updates

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/freetype2/include/freetype/ftcache.h

    r262 r470  
    55/*    FreeType Cache subsystem (specification).                            */
    66/*                                                                         */
    7 /*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by      */
     7/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */
    88/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
    99/*                                                                         */
     
    5757   *
    5858   *   Second, the cache calls, only when needed, a client-provided function
    59    *   to convert a @FTC_FaceID into a new @FT_Face object.  The latter is
     59   *   to convert an @FTC_FaceID into a new @FT_Face object.  The latter is
    6060   *   then completely managed by the cache, including its termination
    61    *   through @FT_Done_Face.
     61   *   through @FT_Done_Face.  To monitor termination of face objects, the
     62   *   finalizer callback in the `generic' field of the @FT_Face object can
     63   *   be used, which might also be used to store the @FTC_FaceID of the
     64   *   face.
    6265   *
    6366   *   Clients are free to map face IDs to anything else.  The most simple
     
    212215 /* */
    213216
     217#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     218
     219  /* these macros are incompatible with LLP64, should not be used */
     220
    214221#define FT_POINTER_TO_ULONG( p )  ( (FT_ULong)(FT_Pointer)(p) )
    215222
     
    218225                       ( FT_POINTER_TO_ULONG( i ) << 7 ) ) )
    219226
     227#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
    220228
    221229  /*************************************************************************/
     
    264272  /*    out of a full cache whenever a lookup request is performed.        */
    265273  /*                                                                       */
    266   /*    If you lookup nodes, you have the ability to `acquire' them, i.e., */
    267   /*    to increment their reference count.  This will prevent the node    */
    268   /*    from being flushed out of the cache until you explicitly `release' */
    269   /*    it (see @FTC_Node_Unref).                                          */
     274  /*    If you look up nodes, you have the ability to `acquire' them,      */
     275  /*    i.e., to increment their reference count.  This will prevent the   */
     276  /*    node from being flushed out of the cache until you explicitly      */
     277  /*    `release' it (see @FTC_Node_Unref).                                */
    270278  /*                                                                       */
    271279  /*    See also @FTC_SBitCache_Lookup and @FTC_ImageCache_Lookup.         */
     
    698706            (d1)->flags   == (d2)->flags   )
    699707
     708#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
     709
     710  /* this macro is incompatible with LLP64, should not be used */
     711
    700712#define FTC_IMAGE_TYPE_HASH( d )                          \
    701713          (FT_UFast)( FTC_FACE_ID_HASH( (d)->face_id )  ^ \
    702714                      ( (d)->width << 8 ) ^ (d)->height ^ \
    703715                      ( (d)->flags << 4 )               )
     716
     717#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
    704718
    705719
     
    10941108            (f1)->pix_height == (f2)->pix_height )
    10951109
     1110  /* this macro is incompatible with LLP64, should not be used */
    10961111#define FTC_FONT_HASH( f )                              \
    10971112          (FT_UInt32)( FTC_FACE_ID_HASH((f)->face_id) ^ \
Note: See TracChangeset for help on using the changeset viewer.