From 8a26872f0c9102cb357345eca24a4bf7401bbe70 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 8 Jan 2013 09:23:42 +0100 Subject: fontconfig mesa git update 8 jan 2013 fontconfig: 4e6c7d0827c5b3b20205521bf9bd2e94e704b36d mesa: a60c567fcf29f5d2a41222a8826fee2cb0eb4458 --- fontconfig/conf.d/10-scale-bitmap-fonts.conf | 81 ++++++++++++++++++++ fontconfig/conf.d/Makefile.am | 2 + fontconfig/configure.ac | 7 +- fontconfig/fc-query/fc-query.c | 1 - fontconfig/src/Makefile.am | 1 + fontconfig/src/fcatomic.c | 3 +- fontconfig/src/fccache.c | 7 +- fontconfig/src/fccompat.c | 107 +++++++++++++++++++++++++++ fontconfig/src/fcint.h | 7 ++ fontconfig/src/fcstat.c | 2 +- fontconfig/src/fcxml.c | 2 +- 11 files changed, 211 insertions(+), 9 deletions(-) create mode 100644 fontconfig/conf.d/10-scale-bitmap-fonts.conf create mode 100644 fontconfig/src/fccompat.c (limited to 'fontconfig') diff --git a/fontconfig/conf.d/10-scale-bitmap-fonts.conf b/fontconfig/conf.d/10-scale-bitmap-fonts.conf new file mode 100644 index 000000000..e3bcd46cd --- /dev/null +++ b/fontconfig/conf.d/10-scale-bitmap-fonts.conf @@ -0,0 +1,81 @@ + + + + + + + false + + + + pixelsize + pixelsize + + + + + + false + + + + + pixelsizefixupfactor + 1.2 + + + pixelsizefixupfactor + 0.8 + + + + + + + + false + + + 64 + + + true + + + true + + + 1.0 + + + + + + false + + + 1.0 + + + + matrix + + pixelsizefixupfactor 0 + 0 pixelsizefixupfactor + + + + + + size + pixelsizefixupfactor + + + + + diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am index e3a26f081..77597e57f 100644 --- a/fontconfig/conf.d/Makefile.am +++ b/fontconfig/conf.d/Makefile.am @@ -25,6 +25,7 @@ DOC_FILES= \ README CONF_LINKS = \ + 10-scale-bitmap-fonts.conf \ 20-unhint-small-vera.conf \ 30-urw-aliases.conf \ 30-metric-aliases.conf \ @@ -49,6 +50,7 @@ templatedir = $(TEMPLATEDIR) template_DATA = \ 10-autohint.conf \ 10-no-sub-pixel.conf \ + 10-scale-bitmap-fonts.conf \ 10-sub-pixel-bgr.conf \ 10-sub-pixel-rgb.conf \ 10-sub-pixel-vbgr.conf \ diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 4beca08d3..803084c09 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -60,6 +60,8 @@ AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL @@ -139,7 +141,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP -AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp _mktemp_s strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) dnl AC_CHECK_FUNCS doesn't check for header files. dnl posix_fadvise() may be not available in older libc. @@ -598,6 +600,9 @@ if test "$os_win32" = no; then AX_PTHREAD([have_pthread=true]) fi if $have_pthread; then + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + CC="$PTHREAD_CC" AC_DEFINE(HAVE_PTHREAD, 1, [Have POSIX threads]) fi AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread) diff --git a/fontconfig/fc-query/fc-query.c b/fontconfig/fc-query/fc-query.c index 883e3031e..2983e0f19 100644 --- a/fontconfig/fc-query/fc-query.c +++ b/fontconfig/fc-query/fc-query.c @@ -100,7 +100,6 @@ main (int argc, char **argv) FcChar8 *format = NULL; int err = 0; int i; - FcBlanks *blanks; #if HAVE_GETOPT_LONG || HAVE_GETOPT int c; diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am index 617713fe7..dba42065a 100644 --- a/fontconfig/src/Makefile.am +++ b/fontconfig/src/Makefile.am @@ -131,6 +131,7 @@ libfontconfig_la_SOURCES = \ fccache.c \ fccfg.c \ fccharset.c \ + fccompat.c \ fcdbg.c \ fcdefault.c \ fcdir.c \ diff --git a/fontconfig/src/fcatomic.c b/fontconfig/src/fcatomic.c index cb5b7a5e6..c1daed938 100644 --- a/fontconfig/src/fcatomic.c +++ b/fontconfig/src/fcatomic.c @@ -50,7 +50,6 @@ #include "fcint.h" #include #include -#include #include #include #include @@ -109,7 +108,7 @@ FcAtomicLock (FcAtomic *atomic) strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); - fd = mkstemp ((char *) atomic->tmp); + fd = FcMakeTempfile ((char *) atomic->tmp); if (fd < 0) return FcFalse; f = fdopen (fd, "w"); diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c index 2f1104f25..ddcf07030 100644 --- a/fontconfig/src/fccache.c +++ b/fontconfig/src/fccache.c @@ -156,7 +156,7 @@ FcDirCacheOpenFile (const FcChar8 *cache_file, struct stat *file_stat) if (FcStat (cache_file, file_stat) < 0) return -1; #endif - fd = open((char *) cache_file, O_RDONLY | O_BINARY); + fd = FcOpen((char *) cache_file, O_RDONLY | O_BINARY); if (fd < 0) return fd; #ifndef _WIN32 @@ -876,6 +876,7 @@ bail1: #ifdef _WIN32 +#include #define mkdir(path,mode) _mkdir(path) #endif @@ -977,7 +978,7 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) if (!FcAtomicLock (atomic)) goto bail3; - fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666); + fd = FcOpen((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666); if (fd == -1) goto bail4; @@ -1455,7 +1456,7 @@ FcDirCacheCreateTagFile (const FcChar8 *cache_dir) goto bail1; if (!FcAtomicLock (atomic)) goto bail2; - fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0644); + fd = FcOpen((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT, 0644); if (fd == -1) goto bail3; fp = fdopen(fd, "wb"); diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c new file mode 100644 index 000000000..169cab9ed --- /dev/null +++ b/fontconfig/src/fccompat.c @@ -0,0 +1,107 @@ +/* + * fontconfig/src/fccompat.c + * + * Copyright © 2012 Red Hat, Inc. + * + * Author(s): + * Akira TAGOH + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the author(s) not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The authors make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "fcint.h" + +#if HAVE_FCNTL_H +#include +#endif +#include +#include + +#ifdef O_CLOEXEC +#define FC_O_CLOEXEC O_CLOEXEC +#else +#define FC_O_CLOEXEC 0 +#endif +#ifdef O_LARGEFILE +#define FC_O_LARGEFILE O_LARGEFILE +#else +#define FC_O_LARGEFILE 0 +#endif + +int +FcOpen(const char *pathname, int flags, ...) +{ + int fd = -1; + + if (flags & O_CREAT) + { + va_list ap; + mode_t mode; + + va_start(ap, flags); + mode = (mode_t) va_arg(ap, int); + va_end(ap); + + fd = open(pathname, flags | FC_O_CLOEXEC | FC_O_LARGEFILE, mode); + } + else + { + fd = open(pathname, flags | FC_O_CLOEXEC | FC_O_LARGEFILE); + } + + return fd; +} + +int +FcMakeTempfile (char *template) +{ + int fd = -1; + +#if HAVE_MKOSTEMP + fd = mkostemp (template, FC_O_CLOEXEC); +#elif HAVE_MKSTEMP + fd = mkstemp (template); +# ifdef F_DUPFD_CLOEXEC + if (fd != -1) + { + int newfd = fcntl(fd, F_DUPFD_CLOEXEC); + + close(fd); + fd = newfd; + } +# elif defined(FD_CLOEXEC) + if (fd != -1) + { + fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); + } +# endif +#elif HAVE__MKTEMP_S + if (_mktemp_s(template, strlen(template) + 1) != 0) + return -1; + fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600); +#else +#error no secure functions to create a temporary file +#endif + + return fd; +} diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index 38bd9bb73..3883bc96e 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -717,6 +717,13 @@ FcCharSetSerialize(FcSerialize *serialize, const FcCharSet *cs); FcPrivate FcChar16 * FcCharSetGetNumbers(const FcCharSet *c); +/* fccompat.c */ +FcPrivate int +FcOpen(const char *pathname, int flags, ...); + +FcPrivate int +FcMakeTempfile (char *template); + /* fcdbg.c */ FcPrivate void diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c index 9763c21a4..390f45c37 100644 --- a/fontconfig/src/fcstat.c +++ b/fontconfig/src/fcstat.c @@ -336,7 +336,7 @@ FcIsFsMmapSafe (int fd) FcBool FcIsFsMtimeBroken (const FcChar8 *dir) { - int fd = open ((const char *) dir, O_RDONLY); + int fd = FcOpen ((const char *) dir, O_RDONLY); if (fd != -1) { diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c index b234e4301..2a0d088c1 100644 --- a/fontconfig/src/fcxml.c +++ b/fontconfig/src/fcxml.c @@ -2979,7 +2979,7 @@ FcConfigParseAndLoad (FcConfig *config, if (FcDebug () & FC_DBG_CONFIG) printf ("\tLoading config file %s\n", filename); - fd = open ((char *) filename, O_RDONLY); + fd = FcOpen ((char *) filename, O_RDONLY); if (fd == -1) { FcStrFree (filename); goto bail0; -- cgit v1.2.3