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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 39cd5d8e6e643a34d448d1dd68debca9c0a6d391..37d85f0853eaef996ef1ac6d255e75fc7fd450af 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -23,6 +23,7 @@ CHANGES IN CUPS V1.7.3
          (STR #4402)
        - cupsGetDestMediaCount did not work for CUPS_MEDIA_FLAGS DEFAULT
          (STR #4414)
+       - Auto-typing of PWG Raster files did not work (STR #4417)
 
 
 CHANGES IN CUPS V1.7.2

diff --git a/conf/mime.types b/conf/mime.types
index e462f6282245e090746b89ca7949538441dca1d1..002674e43a11aa99fcfb9969aa1d2b387abfc2a5 100644 (file)
--- 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>@) \