poppler/CairoFontEngine.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
New commits: commit 75c3466ba2e4980802e80b939495981240261cd5 Author: Albert Astals Cid <[email protected]> Date: Fri Apr 10 18:05:54 2009 +0200 Make it compile in Solaris See bug #21080 diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index 3c34fc5..57e3465 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -22,6 +22,7 @@ // Copyright (C) 2007 Koji Otani <[email protected]> // Copyright (C) 2008 Chris Wilson <[email protected]> // Copyright (C) 2008 Adrian Johnson <[email protected]> +// Copyright (C) 2009 Darren Kenny <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -245,7 +246,11 @@ _ft_done_face (void *closure) else _ft_open_faces = data->next; +#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4) + munmap ((char*)data->bytes, data->size); +#else munmap (data->bytes, data->size); +#endif close (data->fd); FT_Done_Face (data->face); @@ -287,7 +292,11 @@ _ft_new_face (FT_Library lib, for (l = _ft_open_faces; l; l = l->next) { if (_ft_face_data_equal (l, &tmpl)) { +#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4) + munmap ((char*)tmpl.bytes, tmpl.size); +#else munmap (tmpl.bytes, tmpl.size); +#endif close (tmpl.fd); *face_out = l->face; *font_face_out = cairo_font_face_reference (l->font_face); @@ -297,7 +306,12 @@ _ft_new_face (FT_Library lib, /* not a dup, open and insert into list */ if (FT_New_Face (lib, filename, 0, &tmpl.face)) { +#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4) + munmap ((char*)tmpl.bytes, tmpl.size); +#else munmap (tmpl.bytes, tmpl.size); +#endif + close (tmpl.fd); return gFalse; } _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
