X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=ft2.h;h=aa203be552e2add9564022191595e103701f10b4;hb=220bfb551bac9181cd121366a3c858ef1499fcdf;hp=99de79a74bd633106c818c8f9bf798d65f0ab254;hpb=34ac3e1a25d3b1541a7b32e89c63812b52c3edac;p=xonotic%2Fdarkplaces.git

diff --git a/ft2.h b/ft2.h
index 99de79a7..aa203be5 100644
--- a/ft2.h
+++ b/ft2.h
@@ -22,7 +22,11 @@
 
 typedef struct ft2_font_map_s ft2_font_map_t;
 typedef struct ft2_attachment_s ft2_attachment_t;
+#ifdef WIN64
+#define ft2_oldstyle_map ((ft2_font_map_t*)-1LL)
+#else
 #define ft2_oldstyle_map ((ft2_font_map_t*)-1)
+#endif
 
 typedef float ft2_kernvec[2];
 typedef struct ft2_kerning_s
@@ -43,7 +47,7 @@ typedef struct ft2_font_s
 
 	// TODO: clean this up and do not expose everything.
 	
-	//unsigned char  *data;
+	const unsigned char  *data; // FT2 needs it to stay
 	//fs_offset_t     datasize;
 	void           *face;
 
@@ -55,6 +59,8 @@ typedef struct ft2_font_s
 	size_t            attachmentcount;
 	ft2_attachment_t *attachments;
 
+	ft2_settings_t *settings;
+
 	// fallback mechanism
 	struct ft2_font_s *next;
 } ft2_font_t;
@@ -72,7 +78,8 @@ ft2_font_map_t *Font_MapForIndex(ft2_font_t *font, int index);
 qboolean        Font_LoadFont(const char *name, dp_font_t *dpfnt);
 qboolean        Font_GetKerningForSize(ft2_font_t *font, float w, float h, Uchar left, Uchar right, float *outx, float *outy);
 qboolean        Font_GetKerningForMap(ft2_font_t *font, int map_index, float w, float h, Uchar left, Uchar right, float *outx, float *outy);
-
+float           Font_VirtualToRealSize(float sz);
+float           Font_SnapTo(float val, float snapwidth);
 // since this is used on a font_map_t, let's name it FontMap_*
 ft2_font_map_t *FontMap_FindForChar(ft2_font_map_t *start, Uchar ch);
 #endif // DP_FREETYPE2_H__