summaryrefslogtreecommitdiff
path: root/games/wesnoth/patches/patch-ab
blob: defcabd80a7519e395f84f9c4277dd78d8ff27e5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
$NetBSD: patch-ab,v 1.3 2006/06/15 12:24:12 wiz Exp $

From
http://www.freetype.org/freetype2/patches/SDL_ttf-2.0.7-noftinternals.patch

--- src/sdl_ttf/SDL_ttf.c.orig	2005-09-21 00:35:47.000000000 +0000
+++ src/sdl_ttf/SDL_ttf.c
@@ -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 @@ TTF_Font* TTF_OpenFontIndexRW( SDL_RWops
 	}
 	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;