Import CUPS v1.7.2

[thirdparty/cups.git] / filter / rastertolabel.c

diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 1c495e65daa9777c0e31dcdedfb81068e3ca8b47..ca0e143da695e06f4b3f9404357d69810be8c831 100644 (file)
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertolabel.c 10996 2013-05-29 11:51:34Z msweet $"
+ * "$Id: rastertolabel.c 11756 2014-03-27 17:06:25Z msweet $"
  *
  *   Label printer filter for CUPS.
  *
@@ -567,7 +567,7 @@ EndPage(ppd_file_t *ppd,            /* I - PPD file */
        */
 
        if (header->cupsRowStep != 200)
-         printf("^LT%u\n", header->cupsRowStep);
+         printf("^LT%d\n", header->cupsRowStep);
 
        /*
         * Set media type...
@@ -639,13 +639,6 @@ EndPage(ppd_file_t *ppd,           /* I - PPD file */
 
         puts("^IDR:CUPS.GRF^FS");
        puts("^XZ");
-
-       /*
-        * Free compression buffers...
-       */
-
-       free(CompBuffer);
-       free(LastBuffer);
         break;
 
     case ZEBRA_CPCL :
@@ -714,6 +707,18 @@ EndPage(ppd_file_t *ppd,           /* I - PPD file */
   */
 
   free(Buffer);
+
+  if (CompBuffer)
+  {
+    free(CompBuffer);
+    CompBuffer = NULL;
+  }
+
+  if (LastBuffer)
+  {
+    free(LastBuffer);
+    LastBuffer = NULL;
+  }
 }
 
 
@@ -1297,5 +1302,5 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertolabel.c 10996 2013-05-29 11:51:34Z msweet $".
+ * End of "$Id: rastertolabel.c 11756 2014-03-27 17:06:25Z msweet $".
  */