diff --git a/ChangeLog b/ChangeLog index d028e0f..df2f618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-05 14:05 Alexander Malmberg + + * Source/art/ftfont.m: Handle freetype <=2.1.2 in the error + reporting. + 2003-07-03 22:03 Alexander Malmberg * Source/art/ftfont.m: Give more information when reporting diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m index 5879a51..9600559 100644 --- a/Source/art/ftfont.m +++ b/Source/art/ftfont.m @@ -990,7 +990,12 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_ { NSLog(@"FTC_SBitCache_Lookup() failed with error %08x (%08x, %ix%i, %08x)\n", error, cur.font.face_id, cur.font.pix_width, cur.font.pix_height, - cur.flags); +#ifdef FT212_STUFF + cur.type +#else + cur.flags +#endif + ); continue; } @@ -1369,7 +1374,12 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_ { NSLog(@"FTC_SBitCache_Lookup() failed with error %08x (%08x, %ix%i, %08x)\n", error, cur.font.face_id, cur.font.pix_width, cur.font.pix_height, - cur.flags); +#ifdef FT212_STUFF + cur.type +#else + cur.flags +#endif + ); continue; } @@ -1687,7 +1697,12 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_ { NSLog(@"FTC_SBitCache_Lookup() failed with error %08x (%08x, %ix%i, %08x)\n", error, cur.font.face_id, cur.font.pix_width, cur.font.pix_height, - cur.flags); +#ifdef FT212_STUFF + cur.type +#else + cur.flags +#endif + ); return NSZeroSize; }