Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 10:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

two linking issues fixed

Browse source 
* _wstr_dup
* _FT_Get_X11_Font_Format (with a work-around)

one weird mingw linking issue remains:
* _WinMain@16


trunk/reactos/lib/3rdparty/mingw/main.c:73: undefined reference to `_WinMain@16'

svn path=/trunk/; revision=29315
This commit is contained in:
Klemens Friedl 2007-09-30 15:43:34 +00:00
parent 6d800c5f56
commit c0ff78a908
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rosapps/smartpdf/baseutils/win_util.c
View file

@ -315,7 +315,7 @@ TCHAR *get_app_data_folder_path(BOOL f_create)
return tstr_dup(_T(""));
#else
/* if all else fails, just use root ("\") directory */
return tstr_dup(_T(""));
return (TCHAR*)str_dup(_T("")); /* @note: mingw doesn't support tstr_dup */
#endif
}
@ -363,7 +363,7 @@ TCHAR *load_string_dup(int str_id)
assert(0);
return NULL;
}
return tstr_dup(buf);
return (TCHAR*)str_dup(buf); /* @note: mingw doesn't support tstr_dup */
}
const TCHAR *load_string(int str_id)

6
rosapps/smartpdf/fitz/mupdf/pdf_font.c
View file

@ -45,7 +45,7 @@ enum { UNKNOWN, TYPE1, TRUETYPE, CID };
static int ftkind(FT_Face face)
{
const char *kind = FT_Get_X11_Font_Format(face);
/*const char *kind = FT_Get_X11_Font_Format(face);
pdf_logfont("ft font format %s\n", kind);
if (!strcmp(kind, "TrueType"))
return TRUETYPE;
@ -55,7 +55,9 @@ static int ftkind(FT_Face face)
return TYPE1;
if (!strcmp(kind, "CID Type 1"))
return TYPE1;
return UNKNOWN;
return UNKNOWN;*/
/* @note: work-around */
return TYPE1;
}
static inline int ftcidtogid(pdf_font *font, int cid)