Author: frik85
Date: Sun Sep 30 19:43:34 2007
New Revision: 29315
URL:
http://svn.reactos.org/svn/reactos?rev=29315&view=rev
Log:
two linking issues fixed
* _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'
Modified:
trunk/rosapps/smartpdf/baseutils/win_util.c
trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c
Modified: trunk/rosapps/smartpdf/baseutils/win_util.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/baseutils/win_uti…
==============================================================================
--- trunk/rosapps/smartpdf/baseutils/win_util.c (original)
+++ trunk/rosapps/smartpdf/baseutils/win_util.c Sun Sep 30 19:43:34 2007
@@ -315,7 +315,7 @@
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 @@
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)
Modified: trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/fitz/mupdf/pdf_fo…
==============================================================================
--- trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c (original)
+++ trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c Sun Sep 30 19:43:34 2007
@@ -45,7 +45,7 @@
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 @@
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)