X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbitmap%2Fbitmapfunc.c;h=603d5d9048d96e3990d47282429b5e7c2e24fc40;hb=3e1969f2133dfd2fac68f01b2b2aa460d86174d7;hp=47ce488d0b705cef79816e3989c13d580c20b750;hpb=45d55832022c5ce693e99f8de99480ab968e5ff0;p=framework%2Fuifw%2Fxorg%2Flib%2Flibxfont.git diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c old mode 100755 new mode 100644 index 47ce488..603d5d9 --- a/src/bitmap/bitmapfunc.c +++ b/src/bitmap/bitmapfunc.c @@ -56,10 +56,10 @@ in this Software without prior written authorization from The Open Group. #include "snfstr.h" typedef struct _BitmapFileFunctions { - int (*ReadFont) (FontPtr /* pFont */, FontFilePtr /* file */, - int /* bit */, int /* byte */, + int (*ReadFont) (FontPtr /* pFont */, FontFilePtr /* file */, + int /* bit */, int /* byte */, int /* glyph */, int /* scan */); - int (*ReadInfo) ( FontInfoPtr /* pFontInfo */, + int (*ReadInfo) ( FontInfoPtr /* pFontInfo */, FontFilePtr /* file */ ); } BitmapFileFunctionsRec, *BitmapFileFunctionsPtr; @@ -107,8 +107,8 @@ static BitmapFileFunctionsRec readers[] = { #define CAPABILITIES (CAP_MATRIX | CAP_CHARSUBSETTING) static int -BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, - FontEntryPtr entry, char *fileName, +BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, + FontEntryPtr entry, char *fileName, fsBitmapFormat format, fsBitmapFormatMask fmask, FontPtr non_cachable_font) /* We don't do licensing */ { @@ -152,7 +152,7 @@ BitmapOpenBitmap (FontPathElementPtr fpe, FontPtr *ppFont, int flags, } static int -BitmapGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo, +BitmapGetInfoBitmap (FontPathElementPtr fpe, FontInfoPtr pFontInfo, FontEntryPtr entry, char *fileName) { FontFilePtr file;