From: Michael Sweet Date: Wed, 1 Mar 2017 20:23:47 +0000 (-0500) Subject: Mirror changes from IPP sample code. X-Git-Tag: v2.2.3~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e9bb5508b5ecaf82b39a45741dfd9fc65a7865;p=thirdparty%2Fcups.git Mirror changes from IPP sample code. --- diff --git a/cups/ipp-support.c b/cups/ipp-support.c index b3f38113e5..b6431e1171 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -897,12 +897,14 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "k-octets", "k-octets-processed", "last-document", + "materials-col-actual", /* IPP 3D */ "media-actual", "media-col-actual", "media-input-tray-check-actual", "media-sheets", "media-sheets-completed", "more-info", + "multiple-object-handling-actual", /* IPP 3D */ "number-up-actual", "orientation-requested-actual", "output-bin-actual", @@ -914,12 +916,17 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "pages", "pages-completed", "pages-completed-current-copy", + "platform-temperature-actual", /* IPP 3D */ "presentation-direction-number-up-actual", + "print-accuracy-actual", /* IPP 3D */ + "print-base-actual", /* IPP 3D */ "print-color-mode-actual", "print-content-optimize-actual", + "print-objects-actual", /* IPP 3D */ "print-quality-actual", "print-rendering-intent-actual", "print-scaling-actual", /* IPP Paid Printing */ + "print-supports-actual", /* IPP 3D */ "printer-resolution-actual", "printer-up-time", "separator-sheets-actual", @@ -974,6 +981,20 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "insert-sheet", "insert-sheet-default", "insert-sheet-supported", + "material-amount-units-supported", /* IPP 3D */ + "material-diameter-supported", /* IPP 3D */ + "material-purpose-supported", /* IPP 3D */ + "material-rate-supported", /* IPP 3D */ + "material-rate-units-supported", /* IPP 3D */ + "material-shell-thickness-supported",/* IPP 3D */ + "material-temperature-supported", /* IPP 3D */ + "material-type-supported", /* IPP 3D */ + "materials-col", /* IPP 3D */ + "materials-col-database", /* IPP 3D */ + "materials-col-default", /* IPP 3D */ + "materials-col-ready", /* IPP 3D */ + "materials-col-supported", /* IPP 3D */ + "max-materials-col-supported", /* IPP 3D */ "max-stitching-locations-supported", "media", "media-back-coating-supported", @@ -1006,6 +1027,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "multiple-document-handling", "multiple-document-handling-default", "multiple-document-handling-supported", + "multiple-object-handling", /* IPP 3D */ + "multiple-object-handling-default", /* IPP 3D */ + "multiple-object-handling-supported",/* IPP 3D */ "number-up", "number-up-default", "number-up-supported", @@ -1034,15 +1058,27 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "pdl-init-file-name-subdirectory-supported", "pdl-init-file-name-supported", "pdl-init-file-supported", + "platform-temperature", /* IPP 3D */ + "platform-temperature-default", /* IPP 3D */ + "platform-temperature-supported", /* IPP 3D */ "presentation-direction-number-up", "presentation-direction-number-up-default", "presentation-direction-number-up-supported", + "print-accuracy", /* IPP 3D */ + "print-accuracy-default", /* IPP 3D */ + "print-accuracy-supported", /* IPP 3D */ + "print-base", /* IPP 3D */ + "print-base-default", /* IPP 3D */ + "print-base-supported", /* IPP 3D */ "print-color-mode", "print-color-mode-default", "print-color-mode-supported", "print-content-optimize", "print-content-optimize-default", "print-content-optimize-supported", + "print-objects", /* IPP 3D */ + "print-objects-default", /* IPP 3D */ + "print-objects-supported", /* IPP 3D */ "print-quality", "print-quality-default", "print-quality-supported", @@ -1052,6 +1088,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "print-scaling", /* IPP Paid Printing */ "print-scaling-default", /* IPP Paid Printing */ "print-scaling-supported", /* IPP Paid Printing */ + "print-supports", /* IPP 3D */ + "print-supports-default", /* IPP 3D */ + "print-supports-supported", /* IPP 3D */ "printer-resolution", "printer-resolution-default", "printer-resolution-supported", @@ -1166,10 +1205,12 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "job-state-reasons", "job-uri", "job-uuid", + "materials-col-actual", /* IPP 3D */ "media-actual", "media-col-actual", "media-check-input-tray-actual", "multiple-document-handling-actual", + "multiple-object-handling-actual", /* IPP 3D */ "number-of-documents", "number-of-intervening-jobs", "number-up-actual", @@ -1181,12 +1222,17 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "page-delivery-actual", "page-order-received-actual", "page-ranges-actual", + "platform-temperature-actual", /* IPP 3D */ "presentation-direction-number-up-actual", + "print-accuracy-actual", /* IPP 3D */ + "print-base-actual", /* IPP 3D */ "print-color-mode-actual", "print-content-optimize-actual", + "print-objects-actual", /* IPP 3D */ "print-quality-actual", "print-rendering-intent-actual", "print-scaling-actual", /* IPP Paid Printing */ + "print-supports-actual", /* IPP 3D */ "printer-resolution-actual", "separator-sheets-actual", "sheet-collate-actual", @@ -1208,6 +1254,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ }; static const char * const job_template[] = { /* job-template group */ + "accuracy-units-supported", /* IPP 3D */ "confirmation-sheet-print", /* IPP FaxOut */ "confirmation-sheet-print-default", "copies", @@ -1315,6 +1362,20 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "job-sheets-default", "job-sheets-supported", "logo-uri-schemes-supported", + "material-amount-units-supported", /* IPP 3D */ + "material-diameter-supported", /* IPP 3D */ + "material-purpose-supported", /* IPP 3D */ + "material-rate-supported", /* IPP 3D */ + "material-rate-units-supported", /* IPP 3D */ + "material-shell-thickness-supported",/* IPP 3D */ + "material-temperature-supported", /* IPP 3D */ + "material-type-supported", /* IPP 3D */ + "materials-col", /* IPP 3D */ + "materials-col-database", /* IPP 3D */ + "materials-col-default", /* IPP 3D */ + "materials-col-ready", /* IPP 3D */ + "materials-col-supported", /* IPP 3D */ + "max-materials-col-supported", /* IPP 3D */ "max-save-info-supported", "max-stitching-locations-supported", "media", @@ -1348,6 +1409,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "multiple-document-handling", "multiple-document-handling-default", "multiple-document-handling-supported", + "multiple-object-handling", /* IPP 3D */ + "multiple-object-handling-default", /* IPP 3D */ + "multiple-object-handling-supported",/* IPP 3D */ "number-of-retries", /* IPP FaxOut */ "number-of-retries-default", "number-of-retries-supported", @@ -1385,15 +1449,27 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "pdl-init-file-name-subdirectory-supported", "pdl-init-file-name-supported", "pdl-init-file-supported", + "platform-temperature", /* IPP 3D */ + "platform-temperature-default", /* IPP 3D */ + "platform-temperature-supported", /* IPP 3D */ "presentation-direction-number-up", "presentation-direction-number-up-default", "presentation-direction-number-up-supported", + "print-accuracy", /* IPP 3D */ + "print-accuracy-default", /* IPP 3D */ + "print-accuracy-supported", /* IPP 3D */ + "print-base", /* IPP 3D */ + "print-base-default", /* IPP 3D */ + "print-base-supported", /* IPP 3D */ "print-color-mode", "print-color-mode-default", "print-color-mode-supported", "print-content-optimize", "print-content-optimize-default", "print-content-optimize-supported", + "print-objects", /* IPP 3D */ + "print-objects-default", /* IPP 3D */ + "print-objects-supported", /* IPP 3D */ "print-quality", "print-quality-default", "print-quality-supported", @@ -1403,6 +1479,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "print-scaling", /* IPP Paid Printing */ "print-scaling-default", /* IPP Paid Printing */ "print-scaling-supported", /* IPP Paid Printing */ + "print-supports", /* IPP 3D */ + "print-supports-default", /* IPP 3D */ + "print-supports-supported", /* IPP 3D */ "printer-resolution", "printer-resolution-default", "printer-resolution-supported", @@ -1533,6 +1612,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "pages-per-minute", "pages-per-minute-color", "pdf-k-octets-supported", /* CUPS extension */ + "pdf-features-supported", /* IPP 3D */ "pdf-versions-supported", /* CUPS extension */ "pdl-override-supported", "port-monitor", /* CUPS extension */ @@ -2045,7 +2125,7 @@ ippOpString(ipp_op_t op) /* I - Operation ID */ * See if the operation ID is a known value... */ - if (op >= IPP_OP_PRINT_JOB && op <= IPP_OP_VALIDATE_DOCUMENT) + if (op >= IPP_OP_PRINT_JOB && op < (sizeof(ipp_std_ops) / sizeof(ipp_std_ops[0]))) return (ipp_std_ops[op]); else if (op == IPP_OP_PRIVATE) return ("windows-ext");