diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-11-08 21:31:50 -0500 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-11-08 21:31:50 -0500 |
| commit | 0fa88e19c45f37d89a7d6451f40d8d47dd2a6eb5 (patch) | |
| tree | 88d6e0cc089d05327af59b91a388250429bd2af0 /conf | |
| parent | d4259b45a4465553eccfefa75f773cd8ba2b54ce (diff) | |
| download | cups-0fa88e19c45f37d89a7d6451f40d8d47dd2a6eb5.tar.gz | |
Handle Apple raster.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.convs.in | 29 | ||||
| -rw-r--r-- | conf/mime.types | 9 |
2 files changed, 14 insertions, 24 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in index f460000dd..bffd04f84 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -1,20 +1,18 @@ # -# "$Id$" +# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW +# VERSIONS OF CUPS. Instead, create a "local.convs" file that +# reflects your local configuration changes. # -# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW -# VERSIONS OF CUPS. Instead, create a "local.convs" file that -# reflects your local configuration changes. +# Base MIME conversions file for CUPS. # -# Base MIME conversions file for CUPS. +# Copyright 2007-2016 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # ######################################################################## @@ -47,6 +45,7 @@ application/postscript application/vnd.cups-postscript 66 pstops # PWG Raster filter for IPP Everywhere... application/vnd.cups-raster image/pwg-raster 100 rastertopwg +application/vnd.cups-raster image/urf 100 rastertopwg ######################################################################## # @@ -57,7 +56,3 @@ application/vnd.cups-raster image/pwg-raster 100 rastertopwg # @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 - - -# -# End of "$Id$". -# diff --git a/conf/mime.types b/conf/mime.types index dcb07710e..1c50f16a6 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,13 +1,11 @@ # -# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $" -# # Base MIME types file for CUPS. # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.types" file that # reflects your local configuration changes. # -# Copyright 2007-2015 by Apple Inc. +# Copyright 2007-2016 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -114,6 +112,7 @@ image/x-xpixmap xpm ascii(0,1024) + string(3,"XPM") image/x-sun-raster ras string(0,<59a66a95>) #image/fpx fpx +image/urf urf string(0,UNIRAST<00>) image/x-alias pix short(8,8) short(8,24) image/x-bitmap bmp string(0,BM) + !printable(2,14) image/x-icon ico @@ -176,7 +175,3 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ # application/octet-stream - -# -# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $". -# |