From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Fri, 24 May 2019 12:15:14 +0000 (-0400)
Subject: Mirror ZPL fix from master.
X-Git-Tag: v2.2.12~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd8245cd013a1cb9fc8e6075c80283f031f3e9fb;p=thirdparty%2Fcups.git

Mirror ZPL fix from master.
---

diff --git a/CHANGES.md b/CHANGES.md
index 616e512542..6ddae30828 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.12 - 2019-05-17
+CHANGES - 2.2.12 - 2019-05-24
 =============================
 
 
@@ -19,6 +19,7 @@ Changes in CUPS v2.2.12
   (Issue #5574)
 - The libusb-based USB backend now enforces read limits, improving print speed
   in many cases (Issue #5583)
+- Fixed a command ordering issue in the Zebra ZPL driver.
 
 
 Changes in CUPS v2.2.11
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 6ad6c625af..73cd04be0a 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,7 +1,7 @@
 /*
  * Label printer filter for CUPS.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 2001-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -618,8 +618,8 @@ EndPage(ppd_file_t          *ppd,	/* I - PPD file */
         * End the label and eject...
 	*/
 
-	puts("^XZ");
         puts("^IDR:CUPS.GRF^FS");
+	puts("^XZ");
 
        /*
         * Cut the label as needed...