From 16db8c5ef850239a85cb53b5acb4ac70cea38b57 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Jan 2009 16:00:49 +0000 Subject: [PATCH] drop unused patches --- poppler-0.8.0-ocg-crash.patch | 62 ----------------------------------- poppler-qt3-check.patch | 26 --------------- 2 files changed, 88 deletions(-) delete mode 100644 poppler-0.8.0-ocg-crash.patch delete mode 100644 poppler-qt3-check.patch diff --git a/poppler-0.8.0-ocg-crash.patch b/poppler-0.8.0-ocg-crash.patch deleted file mode 100644 index 38504ef..0000000 --- a/poppler-0.8.0-ocg-crash.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up poppler-0.8.6/poppler-0.8.6/poppler/OptionalContent.cc.jx poppler-0.8.6/poppler-0.8.6/poppler/OptionalContent.cc ---- poppler-0.8.6/poppler-0.8.6/poppler/OptionalContent.cc.jx 20.8.33-14 20:24:54.000000000 -0400 -+++ poppler-0.8.6/poppler-0.8.6/poppler/OptionalContent.cc 20.8.34-06 18:56:06.000000000 -0400 -@@ -162,6 +162,8 @@ OptionalContentGroup* OCGs::findOcgByRef - { - //TODO: make this more efficient - OptionalContentGroup *ocg = NULL; -+ if (!optionalContentGroups) -+ return NULL; - for (int i=0; i < optionalContentGroups->getLength(); ++i) { - ocg = (OptionalContentGroup*)optionalContentGroups->get(i); - if ( (ocg->ref().num == ref.num) && (ocg->ref().gen == ref.gen) ) { -@@ -208,7 +210,7 @@ bool OCGs::optContentIsVisible( Object * - } - } else if (ocg.isRef()) { - OptionalContentGroup* oc = findOcgByRef( ocg.getRef() ); -- if ( oc->state() == OptionalContentGroup::Off ) { -+ if ( !oc || oc->state() == OptionalContentGroup::Off ) { - result = false; - } else { - result = true ; -@@ -218,11 +220,8 @@ bool OCGs::optContentIsVisible( Object * - policy.free(); - } else if ( dictType.isName("OCG") ) { - OptionalContentGroup* oc = findOcgByRef( dictRef->getRef() ); -- if ( oc ) { --// printf("Found valid group object\n"); -- if ( oc->state() == OptionalContentGroup::Off ) { -- result=false; -- } -+ if ( !oc || oc->state() == OptionalContentGroup::Off ) { -+ result=false; - } - } - dictType.free(); -@@ -253,6 +252,8 @@ bool OCGs::allOff( Array *ocgArray ) - ocgArray->getNF(i, &ocgItem); - if (ocgItem.isRef()) { - OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); -+ if (!oc) -+ continue; - if ( oc->state() == OptionalContentGroup::On ) { - return false; - } -@@ -268,6 +269,8 @@ bool OCGs::anyOn( Array *ocgArray ) - ocgArray->getNF(i, &ocgItem); - if (ocgItem.isRef()) { - OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); -+ if (!oc) -+ continue; - if ( oc->state() == OptionalContentGroup::On ) { - return true; - } -@@ -283,6 +286,8 @@ bool OCGs::anyOff( Array *ocgArray ) - ocgArray->getNF(i, &ocgItem); - if (ocgItem.isRef()) { - OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); -+ if (!oc) -+ continue; - if ( oc->state() == OptionalContentGroup::Off ) { - return true; - } diff --git a/poppler-qt3-check.patch b/poppler-qt3-check.patch deleted file mode 100644 index 1a9d69d..0000000 --- a/poppler-qt3-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up configure.qt3-check configure ---- configure.qt3-check 2007-11-10 07:04:36.000000000 -0500 -+++ configure 2007-12-02 21:14:01.000000000 -0500 -@@ -26165,8 +26165,8 @@ fi - - if test x$enable_poppler_qt = xyes; then - --qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include" --qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib" -+qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/lib/qt-3.3/include" -+qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/lib/qt-3.3/lib" - if test -n "$QTDIR" ; then - qt_incdirs="$QTDIR/include $qt_incdirs" - qt_libdirs="$QTDIR/lib $qt_libdirs" -@@ -26192,11 +26192,6 @@ echo "${ECHO_T}$qt_incdir" >&6; } - echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; } - qt_libdir="no" - for qt_check in $qt_libdirs ; do -- if test -r "$qt_check/$qt_test_la_library" ; then -- qt_libdir="$qt_check" -- break -- fi -- - if test -r "$qt_check/$qt_test_library" ; then - qt_libdir="$qt_check" - break