Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@92 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 28 insertions, 99 deletions

diff --git a/cups/transcode.h b/cups/transcode.h
index 5ed8fd8aa..c867b37e2 100644
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -1,7 +1,7 @@
 /*
- * "$Id: transcode.h 4903 2006-01-10 20:02:46Z mike $"
+ * "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
  *
- *   Transcoding support for the Common UNIX Printing System (CUPS).
+ *   Transcoding definitions for the Common UNIX Printing System (CUPS).
  *
  *   Copyright 1997-2006 by Easy Software Products.
  *
@@ -37,115 +37,44 @@ extern "C" {
 
 
 /*
- * Types...
- */
-
-typedef unsigned char  cups_utf8_t;  /* UTF-8 Unicode/ISO-10646 unit */
-typedef unsigned short cups_utf16_t; /* UTF-16 Unicode/ISO-10646 unit */
-typedef unsigned long  cups_utf32_t; /* UTF-32 Unicode/ISO-10646 unit */
-typedef unsigned short cups_ucs2_t;  /* UCS-2 Unicode/ISO-10646 unit */
-typedef unsigned long  cups_ucs4_t;  /* UCS-4 Unicode/ISO-10646 unit */
-typedef unsigned char  cups_sbcs_t;  /* SBCS Legacy 8-bit unit */
-typedef unsigned short cups_dbcs_t;  /* DBCS Legacy 16-bit unit */
-typedef unsigned long  cups_vbcs_t;  /* VBCS Legacy 32-bit unit */
-                                     /* EUC uses 8, 16, 24, 32-bit */
-
-
-/*
- * Structures...
- */
-
-typedef struct _cups_cmap_s		/**** SBCS Charmap Struct ****/
-{
-  struct _cups_cmap_s  *next;          /* Next charmap in cache */
-  int                   used;           /* Number of times entry used */
-  cups_encoding_t       encoding;       /* Legacy charset encoding */
-  cups_ucs2_t           char2uni[256];  /* Map Legacy SBCS -> UCS-2 */
-  cups_sbcs_t           *uni2char[256]; /* Map UCS-2 -> Legacy SBCS */
-} _cups_cmap_t;
-
-typedef struct _cups_wide2uni_s		/**** Wide to Unicode ****/
-{
-  cups_vbcs_t           widechar;       /* VBCS 32-bit Char (EUC) */
-  cups_ucs2_t           unichar;        /* UCS-2 Char */
-} _cups_wide2uni_t;
-
-typedef struct _cups_vmap_s		/**** VBCS Charmap Struct ****/
-{
-  struct _cups_vmap_s  *next;          /* Next charmap in cache */
-  int                   used;           /* Number of times entry used */
-  cups_encoding_t       encoding;       /* Legacy charset encoding */
-  cups_ucs2_t           *char2uni[256]; /* Map 16-bit Char -> UCS-2 */
-  int                   charcount;      /* Count of 16-bit VBCS Chars */
-  _cups_wide2uni_t       *wide2uni;      /* Map 32-bit Char -> UCS-2 */
-  int                   widecount;      /* Count of 32-bit VBCS Chars */
-  cups_vbcs_t           *uni2char[256]; /* Map UCS-2 -> 32-bit VBCS */
-  cups_sbcs_t           lead2char[256]; /* Legacy Lead Char - 2-byte */
-  cups_sbcs_t           lead3char[256]; /* Legacy Lead Char - 3-byte */
-  cups_sbcs_t           lead4char[256]; /* Legacy Lead Char - 4-byte */
-} _cups_vmap_t;
-
-
-/*
  * Constants...
  */
 
-#  define CUPS_MAX_USTRING		8192	/* Max size of Unicode string */
-#  define CUPS_MAX_CHARMAP_LINES	100000	/* Max lines in charmap file */
+#  define CUPS_MAX_USTRING	8192	/* Max size of Unicode string */
 
 
 /*
- * Prototypes...
+ * Types...
  */
 
-/*
- * Utility functions for character set maps
- */
-extern void     *cupsCharmapGet(const cups_encoding_t encoding);
-extern void     cupsCharmapFree(const cups_encoding_t encoding);
-extern void     cupsCharmapFlush(void);
+typedef unsigned char  cups_utf8_t;	/* UTF-8 Unicode/ISO-10646 unit */
+typedef unsigned long  cups_utf32_t;	/* UTF-32 Unicode/ISO-10646 unit */
+typedef unsigned short cups_ucs2_t;	/* UCS-2 Unicode/ISO-10646 unit */
+typedef unsigned long  cups_ucs4_t;	/* UCS-4 Unicode/ISO-10646 unit */
+typedef unsigned char  cups_sbcs_t;	/* SBCS Legacy 8-bit unit */
+typedef unsigned short cups_dbcs_t;	/* DBCS Legacy 16-bit unit */
+typedef unsigned long  cups_vbcs_t;	/* VBCS Legacy 32-bit unit */
+					/* EUC uses 8, 16, 24, 32-bit */
 
-/*
- * Convert UTF-8 to and from legacy character set
- */
-extern int      cupsUTF8ToCharset(char *dest,
-                                  const cups_utf8_t *src,
-                                  const int maxout,
-                                  const cups_encoding_t encoding);
-extern int      cupsCharsetToUTF8(cups_utf8_t *dest,
-                                  const char *src,
-                                  const int maxout,
-                                  const cups_encoding_t encoding);
 
 /*
- * Convert UTF-8 to and from UTF-16
- */
-extern int      cupsUTF8ToUTF16(cups_utf16_t *dest,
-                                const cups_utf8_t *src,
-                                const int maxout);
-extern int      cupsUTF16ToUTF8(cups_utf8_t *dest,
-                                const cups_utf16_t *src,
-                                const int maxout);
-
-/*
- * Convert UTF-8 to and from UTF-32
+ * Prototypes...
  */
-extern int      cupsUTF8ToUTF32(cups_utf32_t *dest,
-                                const cups_utf8_t *src,
-                                const int maxout);
-extern int      cupsUTF32ToUTF8(cups_utf8_t *dest,
-                                const cups_utf32_t *src,
-                                const int maxout);
 
-/*
- * Convert UTF-16 to and from UTF-32
- */
-extern int      cupsUTF16ToUTF32(cups_utf32_t *dest,
-                                 const cups_utf16_t *src,
-                                 const int maxout);
-extern int      cupsUTF32ToUTF16(cups_utf16_t *dest,
-                                 const cups_utf32_t *src,
-                                 const int maxout);
+extern int	cupsCharsetToUTF8(cups_utf8_t *dest,
+				  const char *src,
+				  const int maxout,
+				  const cups_encoding_t encoding);
+extern int	cupsUTF8ToCharset(char *dest,
+				  const cups_utf8_t *src,
+				  const int maxout,
+				  const cups_encoding_t encoding);
+extern int	cupsUTF8ToUTF32(cups_utf32_t *dest,
+				const cups_utf8_t *src,
+				const int maxout);
+extern int	cupsUTF32ToUTF8(cups_utf8_t *dest,
+				const cups_utf32_t *src,
+				const int maxout);
 
 #  ifdef __cplusplus
 }
@@ -155,5 +84,5 @@ extern int      cupsUTF32ToUTF16(cups_utf16_t *dest,
 
 
 /*
- * End of "$Id: transcode.h 4903 2006-01-10 20:02:46Z mike $"
+ * End of "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
  */