Swap ^IDR and ^XZ commands to make sure that page image is deleted on the label

printer. (Why is this even a thing?)

diff --git a/CHANGES.md b/CHANGES.md
index 92775846a70736d68c4bbcb3ded736c6d4eb43bc..257dc2b9ddc9772501de731e12b33aa7fdc785f3 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.3.0 - 2019-05-23
+CHANGES - 2.3.0 - 2019-05-24
 ============================
 
 
@@ -6,6 +6,7 @@ Changes in CUPS v2.3.0
 ----------------------
 
 - Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
+- Fixed a command ordering issue in the Zebra ZPL driver.
 
 
 Changes in CUPS v2.3rc1

diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 226a3740f4bcb3f6ae589e00a00569b54f280de3..510cec7cd5d5bdc4fa405046f8b901a5feca6ee3 100644 (file)
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,10 +1,11 @@
 /*
  * Label printer filter for CUPS.
  *
- * Copyright 2007-2016 by Apple Inc.
- * Copyright 2001-2007 by Easy Software Products.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2001-2007 by Easy Software Products.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -612,8 +613,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...