[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxfont: Changes to 'upstream-unstable'



 .gitignore                      |   11 
 Makefile.am                     |    3 
 configure.ac                    |   27 
 include/X11/fonts/.gitignore    |    2 
 include/X11/fonts/bitmap.h      |    5 
 include/X11/fonts/bufio.h       |    7 
 include/X11/fonts/fntfilst.h    |    2 
 include/X11/fonts/fontconf.h.in |    6 
 include/X11/fonts/fontmisc.h    |   32 
 include/X11/fonts/fontmod.h     |   16 
 include/X11/fonts/pcf.h         |    2 
 src/.gitignore                  |    6 
 src/FreeType/.gitignore         |    6 
 src/FreeType/ft.h               |    4 
 src/FreeType/ftenc.c            |    6 
 src/FreeType/ftfuncs.c          |  133 +-
 src/FreeType/fttools.c          |    6 
 src/FreeType/xttcap.c           |   43 
 src/FreeType/xttcap.h           |    4 
 src/Makefile.am                 |   16 
 src/Speedo/.gitignore           |    6 
 src/Speedo/Makefile.am          |   34 
 src/Speedo/adobe-iso.h          |  200 ----
 src/Speedo/bics-iso.h           |  224 ----
 src/Speedo/bics-unicode.c       |  138 ---
 src/Speedo/bics-unicode.h       |    3 
 src/Speedo/do_char.c            |  809 ------------------
 src/Speedo/do_trns.c            |  498 -----------
 src/Speedo/keys.h               |   56 -
 src/Speedo/out_bl2d.c           |  772 -----------------
 src/Speedo/out_blk.c            |  706 ---------------
 src/Speedo/out_outl.c           |  290 ------
 src/Speedo/out_scrn.c           | 1090 ------------------------
 src/Speedo/out_util.c           |  339 -------
 src/Speedo/reset.c              |  129 --
 src/Speedo/set_spcs.c           |  763 ----------------
 src/Speedo/set_trns.c           | 1214 ---------------------------
 src/Speedo/spdo_prv.h           |  262 -----
 src/Speedo/speedo.h             |  874 -------------------
 src/Speedo/spencode.c           |   67 -
 src/Speedo/sperr.c              |  127 --
 src/Speedo/spfile.c             |  460 ----------
 src/Speedo/spfont.c             |  453 ----------
 src/Speedo/spfuncs.c            |  167 ---
 src/Speedo/spglyph.c            |  399 --------
 src/Speedo/spinfo.c             |  462 ----------
 src/Speedo/spint.h              |  178 ---
 src/Speedo/useropt.h            |   41 
 src/Type1/.gitignore            |    6 
 src/Type1/Makefile.am           |   52 -
 src/Type1/arith.c               |  212 ----
 src/Type1/arith.h               |   71 -
 src/Type1/blues.h               |   95 --
 src/Type1/cluts.h               |   35 
 src/Type1/curves.c              |  228 -----
 src/Type1/curves.h              |   44 
 src/Type1/digit.h               |   64 -
 src/Type1/fontfcn.c             |  317 -------
 src/Type1/fontfcn.h             |  114 --
 src/Type1/fonts.h               |   49 -
 src/Type1/hdigit.h              |   94 --
 src/Type1/hints.c               |  890 -------------------
 src/Type1/hints.h               |   48 -
 src/Type1/lines.c               |  188 ----
 src/Type1/lines.h               |   37 
 src/Type1/objects.c             |  944 ---------------------
 src/Type1/objects.h             |  293 ------
 src/Type1/paths.c               |  748 ----------------
 src/Type1/paths.h               |  205 ----
 src/Type1/pictures.h            |   50 -
 src/Type1/regions.c             | 1328 -----------------------------
 src/Type1/regions.h             |  224 ----
 src/Type1/scanfont.c            | 1526 ---------------------------------
 src/Type1/spaces.c              |  941 --------------------
 src/Type1/spaces.h              |  151 ---
 src/Type1/strokes.h             |   38 
 src/Type1/t1funcs.c             |  754 ----------------
 src/Type1/t1hdigit.h            |   40 
 src/Type1/t1imager.h            |   84 -
 src/Type1/t1info.c              |  496 -----------
 src/Type1/t1intf.h              |   54 -
 src/Type1/t1io.c                |  299 ------
 src/Type1/t1malloc.c            |  759 ----------------
 src/Type1/t1snap.c              |   85 -
 src/Type1/t1stdio.h             |   94 --
 src/Type1/t1unicode.c           |  251 -----
 src/Type1/t1unicode.h           |   25 
 src/Type1/token.c               | 1208 --------------------------
 src/Type1/token.h               |   79 -
 src/Type1/tokst.h               |  510 -----------
 src/Type1/trig.h                |   41 
 src/Type1/type1.c               | 1797 ----------------------------------------
 src/Type1/util.c                |  194 ----
 src/Type1/util.h                |  190 ----
 src/bitmap/.gitignore           |    6 
 src/bitmap/bdfread.c            |   71 -
 src/bitmap/bdfutils.c           |    8 
 src/bitmap/bitmapfunc.c         |   13 
 src/bitmap/bitmaputil.c         |    2 
 src/bitmap/bitscale.c           |  369 --------
 src/bitmap/pcfread.c            |  327 -------
 src/bitmap/pcfwrite.c           |    6 
 src/bitmap/snfread.c            |   62 -
 src/builtins/.gitignore         |    6 
 src/builtins/dir.c              |   19 
 src/builtins/file.c             |    6 
 src/builtins/render.c           |    4 
 src/fc/.gitignore               |    6 
 src/fc/fsconvert.c              |   21 
 src/fc/fserve.c                 |  122 --
 src/fc/fsio.c                   |   21 
 src/fc/fslibos.h                |    2 
 src/fontfile/.gitignore         |    6 
 src/fontfile/Makefile.am        |    2 
 src/fontfile/bitsource.c        |    6 
 src/fontfile/bufio.c            |    8 
 src/fontfile/bunzip2.c          |    6 
 src/fontfile/catalogue.c        |   36 
 src/fontfile/decompress.c       |    4 
 src/fontfile/dirfile.c          |    8 
 src/fontfile/ffcheck.c          |  188 ----
 src/fontfile/fileio.c           |    5 
 src/fontfile/filewr.c           |    2 
 src/fontfile/fontdir.c          |   55 -
 src/fontfile/fontfile.c         |   85 -
 src/fontfile/fontscale.c        |   11 
 src/fontfile/gunzip.c           |    8 
 src/fontfile/printerfont.c      |  178 ---
 src/fontfile/register.c         |   68 -
 src/fontfile/renderers.c        |   12 
 src/stubs/.gitignore            |    6 
 src/stubs/Makefile.am           |    4 
 src/stubs/fontmod.c             |   14 
 src/stubs/xpstubs.c             |   21 
 src/util/.gitignore             |    6 
 src/util/atom.c                 |    9 
 src/util/fontnames.c            |   32 
 src/util/fontutil.c             |   40 
 src/util/fontxlfd.c             |    2 
 src/util/miscutil.c             |   54 -
 src/util/patcache.c             |   14 
 src/util/private.c              |   11 
 src/util/utilbitmap.c           |    6 
 143 files changed, 430 insertions(+), 28598 deletions(-)

New commits:
commit 0045b2555b288099c90b65f97bd4b4a5ebc8c688
Author: Adam Jackson <ajax@redhat.com>
Date:   Wed Feb 18 13:53:14 2009 -0500

    libXfont 1.4.0

diff --git a/configure.ac b/configure.ac
index ab3b121..c6b6ca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
 
 AC_INIT([libXfont],
-	1.3.4,
+	1.4.0,
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 	libXfont)
 dnl

commit 04ced93e997b185b5d9124cacc96fa39a77b2ab7
Author: Peter Astrand <astrand@maggie.lkpg.cendio.se>
Date:   Wed Feb 4 22:09:25 2009 +0100

    Avoid sending uninitialized padding data over the network.
    
    Besides cluttering Valgrind output, this might also be an information leak.
    
    Signed-off-by: Peter Astrand <astrand@cendio.se>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index a1b1796..2ba08e8 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1618,6 +1618,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
     buf[0] = (unsigned char) namelen;
     memcpy(&buf[1], name, namelen);
     openreq.reqType = FS_OpenBitmapFont;
+    openreq.pad = 0;
     openreq.fid = fsd->fontid;
     openreq.format_hint = fsd->format;
     openreq.format_mask = fsd->fmask;
@@ -1630,6 +1631,7 @@ fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
     blockrec->sequenceNumber = conn->current_seq;
     
     inforeq.reqType = FS_QueryXInfo;
+    inforeq.pad = 0;
     inforeq.id = fsd->fontid;
     inforeq.length = SIZEOF(fsQueryXInfoReq) >> 2;
 
@@ -1756,6 +1758,7 @@ fs_send_close_font(FontPathElementPtr fpe, Font id)
 	return Successful;
     /* tell the font server to close the font */
     req.reqType = FS_CloseFont;
+    req.pad = 0;
     req.length = SIZEOF(fsCloseReq) >> 2;
     req.id = id;
     _fs_add_req_log(conn, FS_CloseFont);
@@ -2288,6 +2291,7 @@ fs_send_list_fonts(pointer client, FontPathElementPtr fpe, char *pattern,
 
     /* send the request */
     req.reqType = FS_ListFonts;
+    req.pad = 0;
     req.maxNames = maxnames;
     req.nbytes = patlen;
     req.length = (SIZEOF(fsListFontsReq) + patlen + 3) >> 2;
@@ -2458,6 +2462,7 @@ fs_start_list_with_info(pointer client, FontPathElementPtr fpe,
 
     /* send the request */
     req.reqType = FS_ListFontsWithXInfo;
+    req.pad = 0;
     req.maxNames = maxnames;
     req.nbytes = len;
     req.length = (SIZEOF(fsListFontsWithXInfoReq) + len + 3) >> 2;
@@ -2558,6 +2563,7 @@ fs_client_died(pointer client, FontPathElementPtr fpe)
     {
 	if (cur->client == client) {
 	    freeac.reqType = FS_FreeAC;
+	    freeac.pad = 0;
 	    freeac.id = cur->acid;
 	    freeac.length = sizeof (fsFreeACReq) >> 2;
 	    _fs_add_req_log(conn, FS_FreeAC);
@@ -2632,6 +2638,7 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
 	{
 	    fsFreeACReq	freeac;
 	    freeac.reqType = FS_FreeAC;
+	    freeac.pad = 0;
 	    freeac.id = cur->acid;
 	    freeac.length = sizeof (fsFreeACReq) >> 2;
 	    _fs_add_req_log(conn, FS_FreeAC);
@@ -2660,6 +2667,7 @@ _fs_client_access (FSFpePtr conn, pointer client, Bool sync)
     if (conn->curacid != cur->acid)
     {
     	setac.reqType = FS_SetAuthorization;
+	setac.pad = 0;
     	setac.length = sizeof (fsSetAuthorizationReq) >> 2;
     	setac.id = cur->acid;
     	_fs_add_req_log(conn, FS_SetAuthorization);
@@ -2962,6 +2970,7 @@ _fs_send_cat_sync (FSFpePtr conn)
     lcreq.length = (SIZEOF(fsListCataloguesReq)) >> 2;
     lcreq.maxNames = 0;
     lcreq.nbytes = 0;
+    lcreq.pad2 = 0;
     _fs_add_req_log(conn, FS_SetCatalogues);
     if (_fs_write(conn, (char *) &lcreq, SIZEOF(fsListCataloguesReq)) != FSIO_READY)
 	return FSIO_ERROR;
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index ee93378..79dc0d6 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -394,6 +394,8 @@ _fs_do_write(FSFpePtr conn, char *data, long len, long size)
 	}
     }
     memcpy (conn->outBuf.buf + conn->outBuf.insert, data, len);
+    /* Clear pad data */
+    memset (conn->outBuf.buf + conn->outBuf.insert + len, 0, size - len);
     conn->outBuf.insert += size;
     _fs_mark_block (conn, FS_PENDING_WRITE);
     return FSIO_READY;

commit e15dca77fa76252dd8499f8585d8ce922ac3b869
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Thu Jan 29 18:02:34 2009 -0200

    Janitor: make distcheck and .gitignore
    
      Distribute ChangeLog but not autogen.sh.
      Use a single toplevel .gitignore file, instead of one per subdirectory.

diff --git a/.gitignore b/.gitignore
index 1a0f906..70042c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
@@ -9,6 +11,7 @@ config.status
 config.sub
 configure
 depcomp
+fontconf.h
 install-sh
 libtool
 ltmain.sh
@@ -16,6 +19,12 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
-stamp-h1
+stamp-h?
 xfont.pc
 *~
+*.la
+*.lo
+*.o
+libXfont-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 7971605..1da055b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ nodist_libXfontinclude_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont.pc
 
-EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in
+EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in
 
 .PHONY: ChangeLog
 
diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
deleted file mode 100644
index d8b6626..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-fontconf.h
-stamp-h2
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9fb9857..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
diff --git a/src/FreeType/.gitignore b/src/FreeType/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/FreeType/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/bitmap/.gitignore b/src/bitmap/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/bitmap/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/builtins/.gitignore b/src/builtins/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/builtins/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fc/.gitignore b/src/fc/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fc/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/fontfile/.gitignore b/src/fontfile/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/fontfile/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/stubs/.gitignore b/src/stubs/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/stubs/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in
diff --git a/src/util/.gitignore b/src/util/.gitignore
deleted file mode 100644
index 5200253..0000000
--- a/src/util/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-*.la
-.libs
-*.lo
-Makefile
-Makefile.in

commit 38bac54519a67ab1a276b66dbaa84a3327ccf827
Author: Adam Jackson <ajax@redhat.com>
Date:   Sat Sep 27 02:06:27 2008 -0400

    Remove some strcasecmp silliness

diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index 8df5a6a..ed5fd19 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -59,19 +57,11 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit );
 extern int ValidAtom ( Atom atom );
 extern char *NameForAtom (Atom atom);
 
-extern int f_strcasecmp(const char *s1, const char *s2);
-
 #define lowbit(x) ((x) & (~(x) + 1))
 
 #undef assert
 #define assert(x)	((void)0)
 
-#ifndef strcasecmp
-#if defined(NEED_STRCASECMP)
-#define strcasecmp(s1,s2) f_strcasecmp(s1,s2)
-#endif
-#endif
-
 extern void
 BitOrderInvert(
     register unsigned char *,
diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h
index 9da3c96..e91e523 100644
--- a/src/FreeType/xttcap.h
+++ b/src/FreeType/xttcap.h
@@ -121,10 +121,6 @@ SPropRecValList_dump(SRefPropRecValList *refList);
   Prototypes (xttmisc)
  */
 
-/* compare strings with ignoring case */
- /* False == equal, True == not equal */
-Bool mystrcasecmp(char const *s1, char const *s2);
-
 /* strdup clone */
 char * XttXstrdup(char const *str);
 #undef xstrdup
diff --git a/src/util/fontutil.c b/src/util/fontutil.c
index 181b1b2..aa89ce0 100644
--- a/src/util/fontutil.c
+++ b/src/util/fontutil.c
@@ -411,31 +411,3 @@ add_range(fsRange *newrange,
 
     return Successful;
 }
-
-/* It is difficult to find a good place for this. */
-#ifdef NEED_STRCASECMP
-int
-f_strcasecmp(const char *s1, const char *s2)
-{
-  char c1, c2;
-
-  if (*s1 == 0)
-    if (*s2 == 0)
-      return 0;
-    else
-      return 1;
-
-  c1 = (isupper (*s1) ? tolower (*s1) : *s1);
-  c2 = (isupper (*s2) ? tolower (*s2) : *s2);
-  while (c1 == c2) {
-    if (c1 == '\0')
-      return 0;
-    s1++;
-    s2++;
-    c1 = (isupper (*s1) ? tolower (*s1) : *s1);
-    c2 = (isupper (*s2) ? tolower (*s2) : *s2);
-  }
-  return c1 - c2;
-}
-#endif
-

commit f431b4eb4dc743ccdf94b1b2ed858cc21f63c091
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 20 23:23:40 2009 -0500

    Allow case insensitive filename matching in fontfile.
    
    Simplify the freetype renderer list to match.

diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 35d58d5..47ebac7 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -3898,40 +3898,24 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info,
 static FontRendererRec renderers[] = {
     {".ttf", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".TTF", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".ttc", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".TTC", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".otf", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".OTF", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".otc", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".OTC", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".pfa", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".PFA", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".pfb", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".PFB", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
 };
 static int num_renderers = sizeof(renderers) / sizeof(renderers[0]);
 
 static FontRendererRec alt_renderers[] = {
     {".bdf", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".BDF", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
     {".pcf", 4, 0, FreeTypeOpenScalable, 0,
      FreeTypeGetInfoScalable, 0, CAPABILITIES},
-    {".PCF", 4, 0, FreeTypeOpenScalable, 0,
-     FreeTypeGetInfoScalable, 0, CAPABILITIES},
 };
 
 static int num_alt_renderers =  
diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c
index bdbdab0..bf82c1c 100644
--- a/src/fontfile/renderers.c
+++ b/src/fontfile/renderers.c
@@ -1,5 +1,3 @@
-/* $Xorg: renderers.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -67,8 +65,8 @@ FontFilePriorityRegisterRenderer (FontRendererPtr renderer, int priority)
     }
 
     for (i = 0; i < renderers.number; i++) {
-	if (!strcmp (renderers.renderers[i].renderer->fileSuffix, 
-                     renderer->fileSuffix)) {
+	if (!strcasecmp (renderers.renderers[i].renderer->fileSuffix, 
+                         renderer->fileSuffix)) {
             if(renderers.renderers[i].priority >= priority) {
                 if(renderers.renderers[i].priority == priority) {
                     if (rendererGeneration == 1)
@@ -108,7 +106,7 @@ FontFileMatchRenderer (char *fileName)
     {
 	r = renderers.renderers[i].renderer;
 	if (fileLen >= r->fileSuffixLen &&
-	    !strcmp (fileName + fileLen - r->fileSuffixLen, r->fileSuffix))
+	    !strcasecmp (fileName + fileLen - r->fileSuffixLen, r->fileSuffix))
 	{
 	    return r;
 	}

commit 903d39aeea73a973fb8b05ca1ac147c2cca146cb
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 20 23:21:29 2009 -0500

    Delete some dead ifdefs

diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index 824023f..a4d991d 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -510,17 +510,7 @@ FindBestToScale(FontPathElementPtr fpe, FontEntryPtr entry,
 	   the matrix appropriately */
 	vals->pixel_matrix[0] *= rescale_x;
 	vals->pixel_matrix[1] *= rescale_x;
-#ifdef NOTDEF
-	/* This would force the pointsize and pixelsize fields in the
-	   FONT property to display as matrices to more accurately
-	   report the font being supplied.  It might also break existing
-	   applications that expect a single number in that field. */
-	vals->values_supplied =
-	    vals->values_supplied & ~(PIXELSIZE_MASK | POINTSIZE_MASK) |
-	    PIXELSIZE_ARRAY;
-#else /* NOTDEF */
 	vals->values_supplied = vals->values_supplied & ~POINTSIZE_MASK;
-#endif /* NOTDEF */
 	/* Recompute and reround the FontScalablePtr values after
 	   rescaling for the new width. */
 	FontFileCompleteXLFD(vals, vals);
@@ -1582,11 +1572,6 @@ BitmapOpenScalable (FontPathElementPtr fpe,
 
     /* Can't deal with mix-endian fonts yet */
 
-#ifdef NOTDEF /* XXX need better test */
-    if ((format & BitmapFormatByteOrderMask) !=
-	    (format & BitmapFormatBitOrderMask))
-	return NullFontFileName;
-#endif
 
     /* Reject outrageously small font sizes to keep the math from
        blowing up. */
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 73ad317..8b446a9 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -92,10 +92,6 @@ FontFileFreeEntry (FontEntryPtr entry)
 	free (entry->u.alias.resolved);
 	entry->u.alias.resolved = NULL;
 	break;
-#ifdef NOTYET
-    case FONT_ENTRY_BC:
-	break;
-#endif
     }
 }
 
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index c2eae29..a738c4d 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -325,17 +325,6 @@ FontFileOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
 				     entry->u.alias.resolved, aliasName, &vals);
 	    ret = FontNameAlias;
 	    break;
-#ifdef NOTYET
-	case FONT_ENTRY_BC:
-	    bc = &entry->u.bc;
-	    entry = bc->entry;
-	    ret = (*scalable->renderer->OpenScalable)
-		    (fpe, pFont, flags, entry, &bc->vals, format, fmask,
-		     non_cachable_font);
-	    if (ret == Successful && *pFont)
-		(*pFont)->fpe = fpe;
-	    break;
-#endif
 	default:
 	    ret = BadFontName;
 	}
@@ -922,23 +911,6 @@ FontFileListOneFontWithInfo (pointer client, FontPathElementPtr fpe,
 	    *namelenp = strlen (*namep);
 	    ret = FontNameAlias;
 	    break;
-#ifdef NOTYET
-	case FONT_ENTRY_BC:
-	    /* no LFWI for this yet */
-	    bc = &entry->u.bc;
-	    entry = bc->entry;
-	    /* Make a new scaled instance */
-	    if (strlen(dir->directory) + strlen(scalable->fileName) >=
-		sizeof(fileName)) {
-		ret = BadFontName;
-	    } else {
-		strcpy (fileName, dir->directory);
-		strcat (fileName, scalable->fileName);
-		ret = (*scalable->renderer->GetInfoScalable)
-		    (fpe, *pFontInfo, entry, tmpName, fileName, &bc->vals);
-	    }
-	    break;
-#endif
 	default:
 	    ret = BadFontName;
 	}
@@ -1026,11 +998,6 @@ FontFileListOneFontWithInfo (pointer client, FontPathElementPtr fpe,
 	    }
 	    else
 	    {
-#ifdef NOTDEF
-		/* no special case yet */
-		ret = FontFileMatchBitmapSource (fpe, pFont, flags, entry, &vals, format, fmask, noSpecificSize);
-		if (ret != Successful)
-#endif
 		{
 		    char origName[MAXFONTNAMELEN];
 

commit daa7af2bb2326de363aa5ea51c29616e3634343a
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 20 23:20:20 2009 -0500

    Move the copy of CopyISOLatin1Lowered near its user, and un-weak it.

diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 09fc555..c2eae29 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -36,11 +36,33 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include    <X11/fonts/fntfilst.h>
+#include <X11/fonts/fntfilst.h>
+#include <X11/keysym.h>
 #ifdef WIN32
 #include <ctype.h>
 #endif
 
+static unsigned char
+ISOLatin1ToLower(unsigned char source)
+{
+    if (source >= XK_A && source <= XK_Z)
+	return source + (XK_a - XK_A);
+    if (source >= XK_Agrave && source <= XK_Odiaeresis)
+	return source + (XK_agrave - XK_Agrave);
+    if (source >= XK_Ooblique && source <= XK_Thorn)
+	return source + (XK_oslash - XK_Ooblique);
+    return source;
+}
+
+_X_HIDDEN void
+CopyISOLatin1Lowered(char *dest, char *source, int length)
+{
+    int i;
+    for (i = 0; i < length; i++, source++, dest++)
+	*dest = ISOLatin1ToLower(*source);
+    *dest = '\0';
+}
+
 /*
  * Map FPE functions to renderer functions
  */
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 6e5d52e..3459275 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -43,7 +43,6 @@ from The Open Group.
 
 #ifdef __SUNPRO_C
 #pragma weak serverGeneration
-#pragma weak CopyISOLatin1Lowered
 #pragma weak register_fpe_functions
 #endif
 
@@ -51,27 +50,6 @@ from The Open Group.
 weak long serverGeneration = 1;
 
 weak void
-CopyISOLatin1Lowered (char *dst, char *src, int len)
-{
-    register unsigned char *dest, *source;
-
-    for (dest = (unsigned char *)dst, source = (unsigned char *)src;
-	 *source && len > 0;
-	 source++, dest++, len--)
-    {
-	if ((*source >= XK_A) && (*source <= XK_Z))
-	    *dest = *source + (XK_a - XK_A);
-	else if ((*source >= XK_Agrave) && (*source <= XK_Odiaeresis))
-	    *dest = *source + (XK_agrave - XK_Agrave);
-	else if ((*source >= XK_Ooblique) && (*source <= XK_Thorn))
-	    *dest = *source + (XK_oslash - XK_Ooblique);
-	else
-	    *dest = *source;
-    }
-    *dest = '\0';
-}
-
-weak void
 register_fpe_functions (void)
 {
 }

commit 6c29007756301f513c0151e2b63af073f310af66
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 20 23:17:55 2009 -0500

    Drop OS/2 support

diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 3aa7598..a1b1796 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -217,14 +217,6 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep)
 static Bool
 fs_name_check(char *name)
 {
-#ifdef __UNIXOS2__
-    /* OS/2 uses D:/usr/X11R6/.... as fontfile pathnames, so check that
-     * there is not only a protocol/ prefix, but also that the first chars
-     * are not a drive letter
-     */
-    if (name && isalpha(*name) && name[1] == ':')
-      return FALSE;
-#endif
     /* Just make sure there is a protocol/ prefix */
     return (name && *name != '/' && strchr(name, '/'));
 }
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index cbb1a67..ee93378 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -64,9 +64,6 @@
 #define EINTR WSAEINTR
 #endif
 
-#ifdef __UNIXOS2__
-#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
-#endif
 
 
 static int  padlength[4] = {0, 3, 2, 1};
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h
index acc1f16..65c440c 100644
--- a/src/fc/fslibos.h
+++ b/src/fc/fslibos.h
@@ -64,7 +64,7 @@ from The Open Group.
 # endif
 #endif
 #ifndef OPEN_MAX
-#if defined(SVR4) || defined(__UNIXOS2__)
+#if defined(SVR4) 
 #define OPEN_MAX 256
 #else
 #include <sys/param.h>
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index 9eb00bc..dd8d6e2 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -125,7 +125,7 @@ BufFileRawClose (BufFilePtr f, int doClose)
 BufFilePtr
 BufFileOpenRead (int fd)
 {
-#if defined(__UNIXOS2__) || defined (WIN32)
+#if defined (WIN32)
     /* hv: I'd bet WIN32 has the same effect here */
     setmode(fd,O_BINARY);
 #endif
@@ -160,7 +160,7 @@ BufFileOpenWrite (int fd)
 {
     BufFilePtr	f;
 
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
     /* hv: I'd bet WIN32 has the same effect here */
     setmode(fd,O_BINARY);
 #endif
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
old mode 100755
new mode 100644
index 40692c8..588464f
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -66,7 +66,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
                 status;
     struct stat	statb;
     static char format[24] = "";
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
     int i;
 #endif
 
@@ -76,7 +76,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
 	return BadFontPath;
 
     /* Check for font directory attributes */
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
     if ((ptr = strchr(directory, ':'))) {
 #else
     /* OS/2 and WIN32 path might start with a drive letter, don't clip this */
@@ -118,7 +118,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
 		MAXFONTFILENAMELEN-1, MAXFONTNAMELEN-1);
 
 	while ((count = fscanf(file, format, file_name, font_name)) != EOF) {
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
 	    /* strip any existing trailing CR */
 	    for (i=0; i<strlen(font_name); i++) {
 		if (font_name[i]=='\r') font_name[i] = '\0';
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index 3733148..3e2f98a 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -57,12 +57,7 @@ FontFileOpen (const char *name)
 	return 0;
     }
     len = strlen (name);
-#ifndef __UNIXOS2__
     if (len > 2 && !strcmp (name + len - 2, ".Z")) {
-#else
-    if (len > 2 && (!strcmp (name + len - 4, ".pcz") || 
-		    !strcmp (name + len - 2, ".Z"))) {
-#endif
 	cooked = BufFilePushCompressed (raw);
 	if (!cooked) {
 	    BufFileClose (raw, TRUE);
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index d076f16..f9c53a2 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -42,7 +42,7 @@ FontFileOpenWrite (const char *name)
 {
     int	fd;
 
-#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
+#if defined(WIN32) || defined(__CYGWIN__)
     fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
 #else
     fd = creat (name, 0666);
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 4d1baa9..73ad317 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -118,7 +118,7 @@ FontFileMakeDir(char *dirName, int size)
     char		*attrib;
     int			attriblen;
 
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
     attrib = strchr(dirName, ':');
 #else
     /* OS/2 uses the colon in the drive letter descriptor, skip this */
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index d502569..09fc555 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -55,7 +55,7 @@ int
 FontFileNameCheck (char *name)
 {
 #ifndef NCD
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
     /* OS/2 uses D:/... as a path name for fonts, so accept this as a valid
      * path if it starts with a letter and a colon. Same applies for WIN32
      */
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 7adf74f..4625540 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -202,7 +202,6 @@ xlfd_round_double(double x)
     defined(__hppa__) || \
     defined(__amd64__) || defined(__amd64) || \
     defined(sgi)
-#if !defined(__UNIXOS2__)
 #include <float.h>
 
 /* if we have IEEE 754 fp, we can round to binary digits... */
@@ -263,7 +262,6 @@ xlfd_round_double(double x)
    }
    else
 #endif
-#endif /* !__UNIXOS2__ */
 #endif /* i386 || __i386__ */
     {
 	/*

commit 0cdc9b8f850342d50b72a57507db3413eacc6fb8
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 20 23:16:35 2009 -0500

    xalloc -> malloc, etc.

diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h
index b5977b1..f8e5815 100644
--- a/include/X11/fonts/bufio.h
+++ b/include/X11/fonts/bufio.h
@@ -34,13 +34,6 @@ from The Open Group.
 
 #include <X11/Xfuncproto.h>
 
-#ifdef TEST
-
-#define xalloc(s)   malloc(s)
-#define xfree(s)    free(s)


Reply to: