rpms/hplip/F-12 hplip-bad-low-ink-warning.patch, NONE, 1.1 hplip.spec, 1.248, 1.249

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29668

Modified Files:
	hplip.spec 
Added Files:
	hplip-bad-low-ink-warning.patch 
Log Message:
* Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-24
- Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).


hplip-bad-low-ink-warning.patch:
 dj9xxvip.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE hplip-bad-low-ink-warning.patch ---
diff -up hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp
--- hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning	2009-08-04 22:43:01.000000000 +0100
+++ hplip-3.9.8/prnt/hpijs/dj9xxvip.cpp	2009-11-26 14:34:09.944179766 +0000
@@ -2222,7 +2222,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
             {
                 case '5':
                 {
-                    if ((*(pStr+1) & 0xf3) > 1)
+                    if ((*(pStr+1) & 0xf3) > '1')
                     {
                         if (err != NO_ERROR)
                         {
@@ -2237,7 +2237,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
                 }
                 case '6':
                 {
-                    if ((*(pStr+1) & 0xf3) > 1)
+                    if ((*(pStr+1) & 0xf3) > '1')
                     {
                         if (err != NO_ERROR)
                         {
@@ -2252,7 +2252,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
                 }
                 case '7':
                 {
-                    if ((*(pStr+1) & 0xf3) > 1)
+                    if ((*(pStr+1) & 0xf3) > '1')
                     {
                         if (err != NO_ERROR)
                         {
@@ -2268,7 +2268,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel()
                 }
                 case '8':
                 {
-                    if ((*(pStr+1) & 0xf3) > 1)
+                    if ((*(pStr+1) & 0xf3) > '1')
                     {
                         if (err != NO_ERROR)
                         {


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- hplip.spec	26 Nov 2009 13:41:26 -0000	1.248
+++ hplip.spec	26 Nov 2009 14:34:53 -0000	1.249
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -28,6 +28,7 @@ Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
 Patch16: hplip-duplex-vs-number-up.patch
+Patch17: hplip-bad-low-ink-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -164,6 +165,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed duplex handling in hpcups.drv (bug #533462).
 %patch16 -p1 -b .duplex-vs-number-up
 
+# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
+%patch17 -p1 -b .bad-low-ink-warning
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -375,6 +379,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-24
+- Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-23
 - Removed duplex constraints on page sizes with imageable areas larger
   than possible when duplexing (bug #541572).