diff options
Diffstat (limited to 'filters/kword/pdf/diffs')
| -rw-r--r-- | filters/kword/pdf/diffs/goo_enable-final.diff | 24 | ||||
| -rw-r--r-- | filters/kword/pdf/diffs/goo_gfile.diff | 6 | ||||
| -rw-r--r-- | filters/kword/pdf/diffs/xpdf_TextOutputDev.diff | 6 | ||||
| -rw-r--r-- | filters/kword/pdf/diffs/xpdf_includes.diff | 18 | ||||
| -rw-r--r-- | filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff | 20 | ||||
| -rw-r--r-- | filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff | 40 |
6 files changed, 57 insertions, 57 deletions
diff --git a/filters/kword/pdf/diffs/goo_enable-final.diff b/filters/kword/pdf/diffs/goo_enable-final.diff index b3d137ad7..7993ce58e 100644 --- a/filters/kword/pdf/diffs/goo_enable-final.diff +++ b/filters/kword/pdf/diffs/goo_enable-final.diff @@ -1,11 +1,11 @@ -Index: GHash.cc +Index: GHash.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 ---- GHash.cc 13 Jan 2003 14:51:16 -0000 1.2 -+++ GHash.cc 10 Oct 2004 21:37:09 -0000 1.3 +--- GHash.cpp 13 Jan 2003 14:51:16 -0000 1.2 ++++ GHash.cpp 10 Oct 2004 21:37:09 -0000 1.3 @@ -8,9 +8,6 @@ #include <aconf.h> @@ -34,14 +34,14 @@ diff -u -p -r1.2 -r1.3 #include "gtypes.h" -Index: GList.cc +Index: GList.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 ---- GList.cc 23 Nov 2002 14:15:14 -0000 1.1 -+++ GList.cc 10 Oct 2004 21:37:09 -0000 1.2 +--- GList.cpp 23 Nov 2002 14:15:14 -0000 1.1 ++++ GList.cpp 10 Oct 2004 21:37:09 -0000 1.2 @@ -8,9 +8,6 @@ #include <aconf.h> @@ -70,14 +70,14 @@ diff -u -p -r1.1 -r1.2 #include "gtypes.h" -Index: GString.cc +Index: GString.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 ---- GString.cc 23 Nov 2002 14:15:14 -0000 1.1 -+++ GString.cc 10 Oct 2004 21:37:09 -0000 1.2 +--- GString.cpp 23 Nov 2002 14:15:14 -0000 1.1 ++++ GString.cpp 10 Oct 2004 21:37:09 -0000 1.2 @@ -10,9 +10,6 @@ #include <aconf.h> diff --git a/filters/kword/pdf/diffs/goo_gfile.diff b/filters/kword/pdf/diffs/goo_gfile.diff index 6aac2487c..2e9cdd537 100644 --- a/filters/kword/pdf/diffs/goo_gfile.diff +++ b/filters/kword/pdf/diffs/goo_gfile.diff @@ -1,6 +1,6 @@ -diff -u /home/azhyd/xpdf-2.00/goo/gfile.cc goo/gfile.cc ---- /home/azhyd/xpdf-2.00/goo/gfile.cc Sun Nov 3 23:15:36 2002 -+++ goo/gfile.cc Wed Nov 20 06:43:32 2002 +diff -u /home/azhyd/xpdf-2.00/goo/gfile.cpp goo/gfile.cpp +--- /home/azhyd/xpdf-2.00/goo/gfile.cpp Sun Nov 3 23:15:36 2002 ++++ goo/gfile.cpp Wed Nov 20 06:43:32 2002 @@ -443,7 +443,7 @@ #endif } diff --git a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff index ec981364b..693ecb556 100644 --- a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff +++ b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff @@ -1,6 +1,6 @@ -diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc ---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc Thu Nov 14 04:41:00 2002 -+++ xpdf/TextOutputDev.cc Sat Nov 23 21:01:14 2002 +diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp +--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp Thu Nov 14 04:41:00 2002 ++++ xpdf/TextOutputDev.cpp Sat Nov 23 21:01:14 2002 @@ -46,26 +46,6 @@ // TextBlock //------------------------------------------------------------------------ diff --git a/filters/kword/pdf/diffs/xpdf_includes.diff b/filters/kword/pdf/diffs/xpdf_includes.diff index 33fbea601..c9eeb465d 100644 --- a/filters/kword/pdf/diffs/xpdf_includes.diff +++ b/filters/kword/pdf/diffs/xpdf_includes.diff @@ -10,9 +10,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Error.h xpdf/Error.h extern void CDECL error(int pos, char *msg, ...); -diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc ---- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc Sun Nov 3 23:15:36 2002 -+++ xpdf/PDFDoc.cc Wed Nov 20 07:30:55 2002 +diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp xpdf/PDFDoc.cpp +--- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp Sun Nov 3 23:15:36 2002 ++++ xpdf/PDFDoc.cpp Wed Nov 20 07:30:55 2002 @@ -17,7 +17,7 @@ #include <stddef.h> #include <string.h> @@ -22,9 +22,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc #include "GlobalParams.h" #include "Page.h" #include "Catalog.h" -diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc ---- /home/azhyd/xpdf-2.00/xpdf/Stream.cc Sun Nov 3 23:15:37 2002 -+++ xpdf/Stream.cc Wed Nov 20 07:31:33 2002 +diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cpp xpdf/Stream.cpp +--- /home/azhyd/xpdf-2.00/xpdf/Stream.cpp Sun Nov 3 23:15:37 2002 ++++ xpdf/Stream.cpp Wed Nov 20 07:31:33 2002 @@ -22,7 +22,7 @@ #include <ctype.h> #include "gmem.h" @@ -34,9 +34,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc #include "Error.h" #include "Object.h" #ifndef NO_DECRYPTION -diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc ---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc Thu Nov 14 04:41:00 2002 -+++ xpdf/TextOutputDev.cc Wed Nov 20 07:31:41 2002 +diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp +--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp Thu Nov 14 04:41:00 2002 ++++ xpdf/TextOutputDev.cpp Wed Nov 20 07:31:41 2002 @@ -19,7 +19,7 @@ #include <ctype.h> #include "GString.h" diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff index 1b3872083..d5261ba68 100644 --- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff +++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff @@ -1,10 +1,10 @@ -Index: Catalog.cc +Index: Catalog.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cpp,v retrieving revision 1.1 -diff -u -p -r1.1 Catalog.cc ---- Catalog.cc 23 Nov 2002 14:15:14 -0000 1.1 -+++ Catalog.cc 30 Oct 2004 16:34:49 -0000 +diff -u -p -r1.1 Catalog.cpp +--- Catalog.cpp 23 Nov 2002 14:15:14 -0000 1.1 ++++ Catalog.cpp 30 Oct 2004 16:34:49 -0000 @@ -12,6 +12,7 @@ #pragma implementation #endif @@ -38,13 +38,13 @@ diff -u -p -r1.1 Catalog.cc pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); for (j = pagesSize - 32; j < pagesSize; ++j) { -Index: XRef.cc +Index: XRef.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cpp,v retrieving revision 1.1 -diff -u -p -r1.1 XRef.cc ---- XRef.cc 23 Nov 2002 14:15:14 -0000 1.1 -+++ XRef.cc 30 Oct 2004 16:34:53 -0000 +diff -u -p -r1.1 XRef.cpp +--- XRef.cpp 23 Nov 2002 14:15:14 -0000 1.1 ++++ XRef.cpp 30 Oct 2004 16:34:53 -0000 @@ -12,6 +12,7 @@ #pragma implementation #endif diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff index e64646128..38bb723ec 100644 --- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff +++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff @@ -1,11 +1,11 @@ -Index: goo/GHash.cc +Index: goo/GHash.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v retrieving revision 1.3 retrieving revision 1.2.2.1 diff -u -p -r1.3 -r1.2.2.1 ---- goo/GHash.cc 10 Oct 2004 21:37:09 -0000 1.3 -+++ goo/GHash.cc 21 Oct 2004 20:32:51 -0000 1.2.2.1 +--- goo/GHash.cpp 10 Oct 2004 21:37:09 -0000 1.3 ++++ goo/GHash.cpp 21 Oct 2004 20:32:51 -0000 1.2.2.1 @@ -8,7 +8,6 @@ #include <aconf.h> @@ -30,14 +30,14 @@ diff -u -p -r1.3 -r1.2.2.1 #include "gtypes.h" class GString; -Index: goo/GList.cc +Index: goo/GList.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v retrieving revision 1.2 retrieving revision 1.1.2.1 diff -u -p -r1.2 -r1.1.2.1 ---- goo/GList.cc 10 Oct 2004 21:37:09 -0000 1.2 -+++ goo/GList.cc 21 Oct 2004 20:32:51 -0000 1.1.2.1 +--- goo/GList.cpp 10 Oct 2004 21:37:09 -0000 1.2 ++++ goo/GList.cpp 21 Oct 2004 20:32:51 -0000 1.1.2.1 @@ -8,7 +8,6 @@ #include <aconf.h> @@ -62,14 +62,14 @@ diff -u -p -r1.2 -r1.1.2.1 #include "gtypes.h" //------------------------------------------------------------------------ -Index: goo/GString.cc +Index: goo/GString.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v retrieving revision 1.2 retrieving revision 1.1.2.1 diff -u -p -r1.2 -r1.1.2.1 ---- goo/GString.cc 10 Oct 2004 21:37:09 -0000 1.2 -+++ goo/GString.cc 21 Oct 2004 20:32:51 -0000 1.1.2.1 +--- goo/GString.cpp 10 Oct 2004 21:37:09 -0000 1.2 ++++ goo/GString.cpp 21 Oct 2004 20:32:51 -0000 1.1.2.1 @@ -10,7 +10,6 @@ #include <aconf.h> @@ -94,14 +94,14 @@ diff -u -p -r1.3 -r1.2.2.1 #include <string.h> class GString { -Index: xpdf/Gfx.cc +Index: xpdf/Gfx.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -p -r1.3 -r1.3.2.1 ---- xpdf/Gfx.cc 25 Jan 2003 23:17:44 -0000 1.3 -+++ xpdf/Gfx.cc 22 Dec 2004 12:07:12 -0000 1.3.2.1 +--- xpdf/Gfx.cpp 25 Jan 2003 23:17:44 -0000 1.3 ++++ xpdf/Gfx.cpp 22 Dec 2004 12:07:12 -0000 1.3.2.1 @@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s haveMask = gFalse; dict->lookup("Mask", &maskObj); @@ -113,14 +113,14 @@ diff -u -p -r1.3 -r1.3.2.1 maskObj.arrayGet(i, &obj1); maskColors[i] = obj1.getInt(); obj1.free(); -Index: xpdf/GfxState.cc +Index: xpdf/GfxState.cpp =================================================================== -RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v +RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.2 diff -u -p -r1.3 -r1.3.2.2 ---- xpdf/GfxState.cc 25 Jan 2003 23:17:44 -0000 1.3 -+++ xpdf/GfxState.cc 22 Dec 2004 13:50:53 -0000 1.3.2.2 +--- xpdf/GfxState.cpp 25 Jan 2003 23:17:44 -0000 1.3 ++++ xpdf/GfxState.cpp 22 Dec 2004 13:50:53 -0000 1.3.2.2 @@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa } nCompsA = obj2.getInt(); |