diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-07-26 22:45:43 +0000 |
| commit | 355e94dc85c9adaf0ad76a1dc8f5ff960181059c (patch) | |
| tree | 8acddd9c84526d8611c71ee89d299cf5c978084d /filter | |
| parent | cc0d019f5e08f870f94b8fee5f264b287fcecc3c (diff) | |
| download | cups-355e94dc85c9adaf0ad76a1dc8f5ff960181059c.tar.gz | |
Merge changes from CUPS trunk, r6739.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@361 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Makefile | 6 | ||||
| -rw-r--r-- | filter/rastertolabel.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filter/Makefile b/filter/Makefile index 9961806ec..0833cf6cb 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 6687 2007-07-18 19:49:45Z mike $" +# "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $" # # Filter makefile for the Common UNIX Printing System (CUPS). # @@ -236,7 +236,7 @@ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) # libcupsimage.2.dylib # -libcupsimage.2.dylib: $(IMAGEOBJS) +libcupsimage.2.dylib: $(IMAGEOBJS) $(LIBCUPSIMAGEORDER) echo Linking $@... $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \ -install_name $(libdir)/$@ \ @@ -387,5 +387,5 @@ include Dependencies # -# End of "$Id: Makefile 6687 2007-07-18 19:49:45Z mike $". +# End of "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $". # diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index d883e902f..e9b7bcbf3 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertolabel.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: rastertolabel.c 6718 2007-07-25 00:02:41Z mike $" * * Label printer filter for the Common UNIX Printing System (CUPS). * @@ -1075,7 +1075,7 @@ PCLCompress(unsigned char *line, /* I - Line to compress */ * Set the length of the data and write it... */ - printf("\033*b%dW", comp_ptr - CompBuffer); + printf("\033*b%dW", (int)(comp_ptr - CompBuffer)); fwrite(CompBuffer, comp_ptr - CompBuffer, 1, stdout); /* @@ -1299,5 +1299,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertolabel.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: rastertolabel.c 6718 2007-07-25 00:02:41Z mike $". */ |