Author: soliton
Date: Wed Oct 21 17:38:21 2009
New Revision: 39395
URL: http://svn.gna.org/viewcvs/wesnoth?rev=39395&view=rev
Log:
Apply fix for Freetype 2.2 compatibility from FreeType website
Should fix the problem (bug #5956)
Modified:
branches/1.0/src/sdl_ttf/SDL_ttf.c
Modified: branches/1.0/src/sdl_ttf/SDL_ttf.c
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.0/src/sdl_ttf/SDL_ttf.c?rev=39395&r1=39394&r2=39395&view=diff
==============================================================================
--- branches/1.0/src/sdl_ttf/SDL_ttf.c (original)
+++ branches/1.0/src/sdl_ttf/SDL_ttf.c Wed Oct 21 17:38:21 2009
@@ -43,16 +43,6 @@
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#include FT_TRUETYPE_IDS_H
-/*
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-*/
-#include <freetype/internal/ftobjs.h>
-
-#ifndef FT_OPEN_STREAM
-#define FT_OPEN_STREAM ft_open_stream
-#endif
#include "SDL.h"
#include "SDL_endian.h"
@@ -282,7 +272,7 @@
}
memset(stream, 0, sizeof(*stream));
- stream->memory = library->memory;
+ stream->memory = NULL; /* set by FT_Open_Face */
stream->read = RWread;
stream->descriptor.pointer = src;
stream->pos = (unsigned long)position;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
