diff options
Diffstat (limited to 'libX11/modules/om/generic')
| -rw-r--r-- | libX11/modules/om/generic/Makefile.in | 9 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omDefault.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omGeneric.c | 6 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omImText.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omText.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omTextEsc.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omTextExt.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omTextPer.c | 2 | ||||
| -rw-r--r-- | libX11/modules/om/generic/omXChar.c | 2 |
9 files changed, 5 insertions, 24 deletions
diff --git a/libX11/modules/om/generic/Makefile.in b/libX11/modules/om/generic/Makefile.in index f9cfeeea4..8e24dff42 100644 --- a/libX11/modules/om/generic/Makefile.in +++ b/libX11/modules/om/generic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -163,6 +163,7 @@ GREP = @GREP@ GROFF = @GROFF@ I18N_MODULE_LIBS = @I18N_MODULE_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -195,6 +196,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ @@ -220,16 +222,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@ XDMCP_CFLAGS = @XDMCP_CFLAGS@ XDMCP_LIBS = @XDMCP_LIBS@ XERRORDB = @XERRORDB@ -XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@ -XKBPROTO_LIBS = @XKBPROTO_LIBS@ XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@ XKEYSYMDB = @XKEYSYMDB@ XLOCALEDATADIR = @XLOCALEDATADIR@ XLOCALEDIR = @XLOCALEDIR@ XLOCALELIBDIR = @XLOCALELIBDIR@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ -XPROTO_CFLAGS = @XPROTO_CFLAGS@ -XPROTO_LIBS = @XPROTO_LIBS@ XTHREADLIB = @XTHREADLIB@ XTHREAD_CFLAGS = @XTHREAD_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ @@ -254,7 +252,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ diff --git a/libX11/modules/om/generic/omDefault.c b/libX11/modules/om/generic/omDefault.c index 57dd975ad..322690fa0 100644 --- a/libX11/modules/om/generic/omDefault.c +++ b/libX11/modules/om/generic/omDefault.c @@ -1,4 +1,3 @@ -/* $Xorg: omDefault.c,v 1.3 2000/08/17 19:45:21 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -28,7 +27,6 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/omDefault.c,v 1.6 2003/04/13 19:22:22 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c index 4fdc11baf..c78c0a9d6 100644 --- a/libX11/modules/om/generic/omGeneric.c +++ b/libX11/modules/om/generic/omGeneric.c @@ -1,4 +1,3 @@ -/* $Xorg: omGeneric.c,v 1.6 2000/08/17 19:45:21 cpqbld Exp $ */ /* #define FONTDEBUG */ /* * Copyright 1992, 1993 by TOSHIBA Corp. @@ -32,7 +31,6 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/omGeneric.c,v 3.27 2003/05/27 22:26:27 tsi Exp $ */ /* * Fixed the algorithms in parse_fontname() and parse_fontdata() @@ -412,11 +410,10 @@ set_fontset_extents( } } - if(font_set->vrotate_num > 0) { + if(font_set->vrotate_num > 0 && font_set->vrotate != NULL) { font_data = (FontData) font_set->vrotate; font_data_count = font_set->vrotate_num; for( ; font_data_count-- ; font_data++) { - if(font_data != NULL) if(font_data->font != NULL) { check_fontset_extents(&overall, &logical_ascent, &logical_descent, @@ -572,6 +569,7 @@ get_rotate_fontname( if((ptr = strchr(ptr, '-'))) { *ptr = '\0'; } else { + field_num++; /* Count last field */ break; } } diff --git a/libX11/modules/om/generic/omImText.c b/libX11/modules/om/generic/omImText.c index 627c45b83..1bc08bc25 100644 --- a/libX11/modules/om/generic/omImText.c +++ b/libX11/modules/om/generic/omImText.c @@ -1,4 +1,3 @@ -/* $Xorg: omImText.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omImText.c,v 1.5 2003/04/13 19:22:22 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libX11/modules/om/generic/omText.c b/libX11/modules/om/generic/omText.c index bffc98092..bfceca96e 100644 --- a/libX11/modules/om/generic/omText.c +++ b/libX11/modules/om/generic/omText.c @@ -1,4 +1,3 @@ -/* $Xorg: omText.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omText.c,v 1.9 2003/04/22 13:57:45 pascal Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/libX11/modules/om/generic/omTextEsc.c b/libX11/modules/om/generic/omTextEsc.c index 3d3e62a85..df1fb10c0 100644 --- a/libX11/modules/om/generic/omTextEsc.c +++ b/libX11/modules/om/generic/omTextEsc.c @@ -1,4 +1,3 @@ -/* $Xorg: omTextEsc.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.6 2003/04/13 19:22:22 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/libX11/modules/om/generic/omTextExt.c b/libX11/modules/om/generic/omTextExt.c index 4117e60f9..baeadf6b0 100644 --- a/libX11/modules/om/generic/omTextExt.c +++ b/libX11/modules/om/generic/omTextExt.c @@ -1,4 +1,3 @@ -/* $Xorg: omTextExt.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextExt.c,v 1.5 2003/04/13 19:22:22 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libX11/modules/om/generic/omTextPer.c b/libX11/modules/om/generic/omTextPer.c index 84cee943c..ae08fe6a4 100644 --- a/libX11/modules/om/generic/omTextPer.c +++ b/libX11/modules/om/generic/omTextPer.c @@ -1,4 +1,3 @@ -/* $Xorg: omTextPer.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,6 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextPer.c,v 1.6 2003/04/13 19:22:22 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/libX11/modules/om/generic/omXChar.c b/libX11/modules/om/generic/omXChar.c index b15ff4ddf..ff517d5e5 100644 --- a/libX11/modules/om/generic/omXChar.c +++ b/libX11/modules/om/generic/omXChar.c @@ -1,4 +1,3 @@ -/* $Xorg: omXChar.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -34,7 +33,6 @@ /* * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD) */ -/* $XFree86: xc/lib/X11/omXChar.c,v 1.6tsi Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> |