[cairo-commit] util/cairo-trace

[Chris Wilson]

 util/cairo-trace/trace.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1bda2334b32394a821e6286fbc76617e68da3895
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue May 11 13:51:38 2010 +0100

    trace: And for the bonus round... Make it compile.

diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c
index 4b1335d..6dd58db 100644
--- a/util/cairo-trace/trace.c
+++ b/util/cairo-trace/trace.c
@@ -4162,7 +4162,7 @@ FT_Open_Face (FT_Library library, const FT_Open_Args *args, FT_Long index, FT_Fa
 	    if (args->flags & FT_OPEN_MEMORY) {
 		data->size = args->memory_size;
 		data->data = malloc (args->memory_size);
-		memcpy (data->data, mem, size);
+		memcpy (data->data, args->memory_base, args->memory_size);
 	    } else if (args->flags & FT_OPEN_STREAM) {
 		fprintf (stderr, "FT_Open_Face (stream, %ld) = %p\n",
 			 index, *face);
@@ -4170,7 +4170,7 @@ FT_Open_Face (FT_Library library, const FT_Open_Args *args, FT_Long index, FT_Fa
 	    } else if (args->flags & FT_OPEN_PATHNAME) {
 		data->size = 0;
 		data->data = NULL;
-		_ft_read_file (data, pathname);
+		_ft_read_file (data, args->pathname);
 	    }
 
 	    obj = _type_object_create (NONE, *face);