From ba855c25ecf457ada44a8f5a7bc0967fd86e5b7d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 15 Apr 2010 21:37:06 +0000
Subject: [PATCH] - Another try at fixing black/blank lines in ljcolor hpcups
 output (bug     #579461). This time, try sending entire blank raster lines
 instead of     skipping them.

---
 hplip-skip-blank-lines.patch | 23 +++++++++++------------
 hplip.spec                   |  7 ++++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch
index a301b9b..288a887 100644
--- a/hplip-skip-blank-lines.patch
+++ b/hplip-skip-blank-lines.patch
@@ -1,12 +1,11 @@
-diff -up hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines hplip-3.10.2/prnt/hpcups/Encapsulator.cpp
---- hplip-3.10.2/prnt/hpcups/Encapsulator.cpp.skip-blank-lines	2010-02-25 00:04:09.000000000 +0100
-+++ hplip-3.10.2/prnt/hpcups/Encapsulator.cpp	2010-04-15 17:15:03.000000000 +0200
-@@ -191,7 +191,7 @@ DRIVER_ERROR Encapsulator::SendCAPy(int 
- {
-     DRIVER_ERROR    err = NO_ERROR;
-     char            str[12];
--    sprintf(str, "\x1b*b%dY", iOffset);
-+    sprintf(str, "\x1b*p%dY", iOffset);
-     err = this->Send ((const BYTE *) str, strlen(str));
-     return err;
- }
+diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h
+--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines	2010-02-24 23:04:09.000000000 +0000
++++ hplip-3.10.2/prnt/hpcups/LJColor.h	2010-04-15 21:46:48.375754707 +0100
+@@ -48,6 +48,7 @@ public:
+     DRIVER_ERROR    Configure(Pipeline **pipeline);
+     DRIVER_ERROR    EndJob();
+     DRIVER_ERROR    FormFeed();
++    bool            CanSkipRasters() {return false;}
+ protected:
+     virtual DRIVER_ERROR addJobSettings();
+     void    configureRasterData();
diff --git a/hplip.spec b/hplip.spec
index 02dbbcb..99f3690 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -378,6 +378,11 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Thu Apr 15 2010 Tim Waugh <twaugh@redhat.com> - 3.10.2-6
+- Another try at fixing black/blank lines in ljcolor hpcups output
+  (bug #579461).  This time, try sending entire blank raster lines
+  instead of skipping them.
+
 * Thu Apr 15 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.2-5
 - Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461).