rpms/xpdf/devel xpdf-3.02-mousebuttons_view.patch, NONE, 1.1 xpdf-3.02-crash.patch, 1.1, 1.2 xpdf.spec, 1.12, 1.13

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/xpdf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1649/devel

Modified Files:
	xpdf-3.02-crash.patch xpdf.spec 
Added Files:
	xpdf-3.02-mousebuttons_view.patch 
Log Message:
cleanup crash patch, improve support for more mouse buttons

xpdf-3.02-mousebuttons_view.patch:

--- NEW FILE xpdf-3.02-mousebuttons_view.patch ---
--- xpdf-3.02/xpdf/XPDFViewer.cc~	2009-02-02 01:58:55.000000000 -0700
+++ xpdf-3.02/xpdf/XPDFViewer.cc	2009-02-02 02:27:04.000000000 -0700
@@ -592,13 +592,13 @@ void XPDFViewer::mouseCbk(void *data, XE
   int i;
 
   if (event->type == ButtonPress) {
-    if (event->xbutton.button >= 1 && event->xbutton.button <= 7) {
+    if (event->xbutton.button >= 1 && event->xbutton.button <= 9) {
       keyCode = xpdfKeyCodeMousePress1 + event->xbutton.button - 1;
     } else {
       return;
     }
   } else if (event->type == ButtonRelease) {
-    if (event->xbutton.button >= 1 && event->xbutton.button <= 7) {
+    if (event->xbutton.button >= 1 && event->xbutton.button <= 9) {
       keyCode = xpdfKeyCodeMouseRelease1 + event->xbutton.button - 1;
     } else {
       return;

xpdf-3.02-crash.patch:

Index: xpdf-3.02-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/xpdf-3.02-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpdf-3.02-crash.patch	10 Dec 2008 17:32:49 -0000	1.1
+++ xpdf-3.02-crash.patch	11 Feb 2009 17:07:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up xpdf-3.02/fofi/FoFiType1.cc.BAD xpdf-3.02/fofi/FoFiType1.cc
---- xpdf-3.02/fofi/FoFiType1.cc.BAD	2008-12-10 11:55:08.000000000 -0500
-+++ xpdf-3.02/fofi/FoFiType1.cc	2008-12-10 11:57:42.000000000 -0500
+diff -up xpdf-3.02/fofi/FoFiType1.cc.crash xpdf-3.02/fofi/FoFiType1.cc
+--- xpdf-3.02/fofi/FoFiType1.cc.crash	2007-02-27 17:05:51.000000000 -0500
++++ xpdf-3.02/fofi/FoFiType1.cc	2009-02-11 11:31:04.000000000 -0500
 @@ -235,9 +235,14 @@ void FoFiType1::parse() {
  	    }
  	  }
@@ -19,10 +19,22 @@
  	  }
  	}
        }
-diff -up xpdf-3.02/splash/Splash.cc.BAD xpdf-3.02/splash/Splash.cc
---- xpdf-3.02/splash/Splash.cc.BAD	2008-12-10 11:54:10.000000000 -0500
-+++ xpdf-3.02/splash/Splash.cc	2008-12-10 11:54:49.000000000 -0500
-@@ -1573,6 +1573,11 @@ SplashError Splash::xorFill(SplashPath *
+diff -up xpdf-3.02/splash/Splash.cc.crash xpdf-3.02/splash/Splash.cc
+--- xpdf-3.02/splash/Splash.cc.crash	2007-02-27 17:05:52.000000000 -0500
++++ xpdf-3.02/splash/Splash.cc	2009-02-11 11:34:45.000000000 -0500
+@@ -1501,6 +1501,11 @@ SplashError Splash::fillWithPattern(Spla
+     xPath->aaScale();
+   }
+   xPath->sort();
++  if (!&xPath->segs[0])
++  {
++    delete xPath;
++    return splashErrEmptyPath;
++  }
+   scanner = new SplashXPathScanner(xPath, eo);
+ 
+   // get the min and max x and y values
+@@ -1573,6 +1578,11 @@ SplashError Splash::xorFill(SplashPath *
    }
    xPath = new SplashXPath(path, state->matrix, state->flatness, gTrue);
    xPath->sort();


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xpdf.spec	10 Dec 2008 17:32:49 -0000	1.12
+++ xpdf.spec	11 Feb 2009 17:07:51 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -46,6 +46,7 @@
 Patch17: xpdf-3.02-x86_64-fix.patch
 Patch18: xpdf-3.02-mousebuttons.patch
 Patch19: xpdf-3.02-additionalzoom.patch
+Patch20: xpdf-3.02-mousebuttons_view.patch
 
 # Security patches
 Patch100: xpdf-3.02pl1.patch
@@ -108,6 +109,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 # security patches
 %patch100 -p1 -b .security
@@ -266,6 +268,10 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Wed Feb 11 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-10
+- cleanup crash patch a bit (bz 483664)
+- improve support for more mouse buttons (bz 483669)
+
 * Wed Dec 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-9
 - apply debian patches