diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-05-22 12:56:59 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-05-22 12:56:59 +0000 |
| commit | eceee985ef5a1b2888f84c038c4d9aefb7d44960 (patch) | |
| tree | 2f4ba3b33291e56899e8ebe85a7427b0e347f9a4 /conf | |
| parent | 6a87b7d7ea0e65324c0dddb7b750c6c617163e5a (diff) | |
| download | cups-eceee985ef5a1b2888f84c038c4d9aefb7d44960.tar.gz | |
Fix PWG Raster auto-typing (STR #4417)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11886 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.types | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/conf/mime.types b/conf/mime.types index e462f6282..002674e43 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,20 +1,20 @@ # # "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $" # -# Base MIME types file for CUPS. +# 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. +# 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-2013 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products. +# Copyright 2007-2014 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/". # ######################################################################## @@ -93,7 +93,7 @@ image/jpeg jpeg jpg jpe string(0,<FFD8FF>) +\ char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\ char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\ char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef)) -image/pwg-raster string(0,"RaS2") + string(4,PwgRaster<00>) priority(100) +image/pwg-raster string(0,"RaS2") + string(4,PwgRaster<00>) priority(150) image/tiff tiff tif string(0,MM<002A>) string(0,II<2A00>) image/x-photocd pcd string(2048,PCD_IPI) image/x-portable-anymap pnm @@ -153,7 +153,7 @@ application/vnd.cups-pdf application/vnd.cups-postscript application/vnd.cups-ppd ppd string(0,"*PPD-Adobe:") application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR") \ - string(0,"RaS2") string(0,"2SaR") \ + (string(0,"RaS2") + !string(4,PwgRaster<00>)) string(0,"2SaR") \ string(0,"RaS3") string(0,"3SaR") application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ string(0,<1B>@) \ |