Support TIFF files in ipptool (STR #4418)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11885 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 59f3acfd243d46b0e0fd4fd220c62d384efcc35f..de7517df49637a162976fd5207274ebf56c872e8 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.0b1 - 2014-05-15
+CHANGES.txt - 2.0b1 - 2014-05-21
 --------------------------------
 
 CHANGES IN CUPS V2.0b1
@@ -43,4 +43,5 @@ CHANGES IN CUPS V2.0b1
          hierarchical searches (STR #4395)
        - Added support for simultaneous XML and test output from ipptool.
        - Added support for PAUSE directive in ipptool test files.
+       - Added support for auto-typing of TIFF files by ipptool (STR #4418)
 

diff --git a/test/ipptool.c b/test/ipptool.c
index d8df4cb26fc8d32a65f7c7760be7a997d36109b4..cbbc39994548ed0197aad9748c8099b24ff187c0 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -494,12 +494,15 @@ main(int  argc,                           /* I - Number of command-line args */
                          !_cups_strcasecmp(ext, ".ras") ||
                          !_cups_strcasecmp(ext, ".ras.gz"))
                   set_variable(outfile, &vars, "filetype", "image/pwg-raster");
-                else if (!_cups_strcasecmp(ext, ".urf") ||
-                         !_cups_strcasecmp(ext, ".urf.gz"))
-                  set_variable(outfile, &vars, "filetype", "image/urf");
+                else if (!_cups_strcasecmp(ext, ".tif") ||
+                         !_cups_strcasecmp(ext, ".tiff"))
+                  set_variable(outfile, &vars, "filetype", "image/tiff");
                 else if (!_cups_strcasecmp(ext, ".txt") ||
                          !_cups_strcasecmp(ext, ".txt.gz"))
                   set_variable(outfile, &vars, "filetype", "text/plain");
+                else if (!_cups_strcasecmp(ext, ".urf") ||
+                         !_cups_strcasecmp(ext, ".urf.gz"))
+                  set_variable(outfile, &vars, "filetype", "image/urf");
                 else if (!_cups_strcasecmp(ext, ".xps"))
                   set_variable(outfile, &vars, "filetype", "application/openxps");
                 else