Author: malat Date: 2013-10-28 16:00:27 +0000 (Mon, 28 Oct 2013) New Revision: 15026
Modified: trunk/packages/papyrus/trunk/debian/README.Debian trunk/packages/papyrus/trunk/debian/README.source trunk/packages/papyrus/trunk/debian/patches/addcmake.patch trunk/packages/papyrus/trunk/debian/patches/fixcase.patch trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch trunk/packages/papyrus/trunk/debian/patches/hardening.patch Log: Remove warnings from patches Modified: trunk/packages/papyrus/trunk/debian/README.Debian =================================================================== --- trunk/packages/papyrus/trunk/debian/README.Debian 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/README.Debian 2013-10-28 16:00:27 UTC (rev 15026) @@ -1,2 +1,4 @@ The build system has been replaced with a cmake based one. Since maintainer is more confortable with it. + + -- Mathieu Malaterre <ma...@debian.org> Mon, 28 Oct 2013 16:29:59 +0100 Modified: trunk/packages/papyrus/trunk/debian/README.source =================================================================== --- trunk/packages/papyrus/trunk/debian/README.source 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/README.source 2013-10-28 16:00:27 UTC (rev 15026) @@ -6,4 +6,4 @@ DICOM. This library is provided in Debian for legacy apps that need to deals with this old format. It will be provided as a read-only library. - -- Mathieu Malaterre <ma...@debian.org> Sun, 27 Oct 2013 07:08:17 +0100 + -- Mathieu Malaterre <ma...@debian.org> Mon, 28 Oct 2013 16:29:59 +0100 Modified: trunk/packages/papyrus/trunk/debian/patches/addcmake.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/addcmake.patch 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/patches/addcmake.patch 2013-10-28 16:00:27 UTC (rev 15026) @@ -5,7 +5,7 @@ Index: Papyrus3/JpegDir/JpgLless/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Papyrus3/JpegDir/JpgLless/CMakeLists.txt 2013-10-28 16:50:12.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,18 @@ +# JpgLless +set(SOURCES @@ -28,7 +28,7 @@ Index: Papyrus3/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Papyrus3/CMakeLists.txt 2013-10-28 16:51:27.000000000 +0100 ++++ Papyrus3/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,176 @@ +# Copyright Mathieu Malaterre <ma...@debian.org> +# LGPL-2.1 @@ -92,7 +92,7 @@ + list(APPEND SOURCES PapyFileSystemPC3.c PapyEallocPC3.c) +endif() + -+list(APPEND SOURCES ++list(APPEND SOURCES + DicomDir/DicomDirDataSetRead.c + DicomDir/DicomDirDataSetWrite.c + DicomDir/DicomDirFiles.c @@ -110,7 +110,7 @@ + DicomDir/DicomdirTypeDef3.h + DicomDir/OGlobalDicomFunc.h + ) -+list(APPEND SOURCES ++list(APPEND SOURCES + JpegDir/JpgLless/decompoptimise.c + JpegDir/JpgLless/huffcoptimisebug.c + JpegDir/JpgLless/huffdoptimise.c @@ -131,7 +131,7 @@ + JpegDir/JpgLless/PROTO.H + PROPERTIES LANGUAGE C) + -+list(APPEND SOURCES ++list(APPEND SOURCES + JpegDir/JpgLossy/JCAPIMIN.C + JpegDir/JpgLossy/JCAPISTD.C + JpegDir/JpgLossy/JCCOEFCT.C @@ -209,7 +209,7 @@ Index: Papyrus3/JpegDir/JpgLossy/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Papyrus3/JpegDir/JpgLossy/CMakeLists.txt 2013-10-28 16:50:12.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,52 @@ +# JpgLossy +set(SOURCES @@ -266,7 +266,7 @@ Index: Papyrus3/DicomDir/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Papyrus3/DicomDir/CMakeLists.txt 2013-10-28 16:50:12.000000000 +0100 ++++ Papyrus3/DicomDir/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,35 @@ +# DicomDir +set(SOURCES @@ -306,7 +306,7 @@ Index: Papyrus3/TESTS/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ Papyrus3/TESTS/CMakeLists.txt 2013-10-28 16:51:42.000000000 +0100 ++++ Papyrus3/TESTS/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,8 @@ +# Tests +add_executable(TestRead TestRead.c) Modified: trunk/packages/papyrus/trunk/debian/patches/fixcase.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/fixcase.patch 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/patches/fixcase.patch 2013-10-28 16:00:27 UTC (rev 15026) @@ -4,8 +4,8 @@ Index: Papyrus3/JpegDir/JpgLless/MCU.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/MCU.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/MCU.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/MCU.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/MCU.C 2013-10-28 16:57:08.000000000 +0100 @@ -32,9 +32,9 @@ #include <stdlib.h> /* #include <malloc.h> */ @@ -21,8 +21,8 @@ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/WRITE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/WRITE.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/WRITE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/WRITE.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/WRITE.C 2013-10-28 16:57:08.000000000 +0100 @@ -38,10 +38,10 @@ #include <malloc.h> */ @@ -40,8 +40,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLless/READ.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/READ.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/READ.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/READ.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/READ.C 2013-10-28 16:57:08.000000000 +0100 @@ -36,10 +36,10 @@ #include <stdio.h> #include <stdlib.h> @@ -59,8 +59,8 @@ * To fix a memory leak (memory malloc'd then never freed) in the original Index: Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 16:57:08.000000000 +0100 @@ -42,10 +42,10 @@ #include <errno.h> @@ -78,8 +78,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLless/pmreadoptimise.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 16:57:08.000000000 +0100 @@ -30,11 +30,11 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ @@ -99,8 +99,8 @@ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/PREDICT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/PREDICT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/PREDICT.C 2013-10-28 16:57:08.000000000 +0100 @@ -26,7 +26,7 @@ */ @@ -112,8 +112,8 @@ /* Index: Papyrus3/PapyConvertFile3.c =================================================================== ---- Papyrus3.orig/PapyConvertFile3.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/PapyConvertFile3.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/PapyConvertFile3.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/PapyConvertFile3.c 2013-10-28 16:57:08.000000000 +0100 @@ -61,8 +61,8 @@ #define CHECK_MEMORY #define HAVE_BOOLEAN @@ -127,8 +127,8 @@ #include "Papyrus3.h" Index: Papyrus3/JpegDir/JpgLless/JPEGLESS.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/JPEGLESS.H 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/JPEGLESS.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/JPEGLESS.H 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/JPEGLESS.H 2013-10-28 16:57:08.000000000 +0100 @@ -70,7 +70,7 @@ #endif /* FILENAME83 defined */ @@ -140,8 +140,8 @@ /* Global variables for lossless encoding process */ Index: Papyrus3/JpegDir/JpgLossy/JPEGLIB.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JPEGLIB.H 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JPEGLIB.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JPEGLIB.H 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JPEGLIB.H 2013-10-28 16:57:08.000000000 +0100 @@ -21,9 +21,9 @@ */ @@ -167,8 +167,8 @@ #endif /* JPEGLIB_H */ Index: Papyrus3/DicomDir/DicomDir.h =================================================================== ---- Papyrus3.orig/DicomDir/DicomDir.h 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/DicomDir/DicomDir.h 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/DicomDir/DicomDir.h 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/DicomDir/DicomDir.h 2013-10-28 16:57:08.000000000 +0100 @@ -68,16 +68,16 @@ #include "DicomDirEnumRecords.h" #endif @@ -192,8 +192,8 @@ #else /* FILENAME83 defined for the DOS machines */ Index: Papyrus3/PapyRead3.c =================================================================== ---- Papyrus3.orig/PapyRead3.c 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/PapyRead3.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/PapyRead3.c 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/PapyRead3.c 2013-10-28 16:57:08.000000000 +0100 @@ -72,8 +72,8 @@ #include <math.h> @@ -207,8 +207,8 @@ #include "Mayo.h" /* interface for wavelet decompressor */ Index: Papyrus3/PapyWrite3.c =================================================================== ---- Papyrus3.orig/PapyWrite3.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/PapyWrite3.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/PapyWrite3.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/PapyWrite3.c 2013-10-28 16:57:08.000000000 +0100 @@ -78,8 +78,8 @@ #endif @@ -222,8 +222,8 @@ #ifdef MAYO_WAVE Index: Papyrus3/JpegDir/JpgLless/decompoptimise.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/decompoptimise.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/decompoptimise.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/decompoptimise.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/decompoptimise.c 2013-10-28 16:57:08.000000000 +0100 @@ -50,10 +50,10 @@ #include <stdlib.h> #include <string.h> @@ -241,8 +241,8 @@ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/PROTO.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/PROTO.H 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/PROTO.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/PROTO.H 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/PROTO.H 2013-10-28 16:57:08.000000000 +0100 @@ -42,7 +42,7 @@ # define P(s) () #endif @@ -254,8 +254,8 @@ Index: Papyrus3/JpegDir/JpgLless/IO.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/IO.H 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/IO.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/IO.H 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/IO.H 2013-10-28 16:57:08.000000000 +0100 @@ -52,7 +52,7 @@ #ifndef _IO #define _IO @@ -267,8 +267,8 @@ /* Index: Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/huffcoptimisebug.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/huffcoptimisebug.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c 2013-10-28 16:57:08.000000000 +0100 @@ -42,12 +42,12 @@ #include <stdlib.h> #include <string.h> @@ -290,8 +290,8 @@ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/huffdoptimise.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/huffdoptimise.c 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/huffdoptimise.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/huffdoptimise.c 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/huffdoptimise.c 2013-10-28 16:57:08.000000000 +0100 @@ -42,11 +42,11 @@ #include <stdlib.h> #include <string.h> @@ -311,8 +311,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCSAMPLE.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCSAMPLE.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C 2013-10-28 16:57:08.000000000 +0100 @@ -46,8 +46,8 @@ */ @@ -326,8 +326,8 @@ /* Pointer to routine to downsample a single component */ Index: Papyrus3/JpegDir/JpgLossy/JDPHUFF.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDPHUFF.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDPHUFF.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDPHUFF.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDPHUFF.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,9 +15,9 @@ */ @@ -343,8 +343,8 @@ #ifdef D_PROGRESSIVE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDMASTER.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDMASTER.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDMASTER.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDMASTER.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDMASTER.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,8 +12,8 @@ */ @@ -358,8 +358,8 @@ /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JCHUFF.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCHUFF.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCHUFF.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCHUFF.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCHUFF.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,9 +15,9 @@ */ @@ -375,8 +375,8 @@ /* Expanded entropy encoder object for Huffman encoding. Index: Papyrus3/JpegDir/JpgLossy/JCCOLOR.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCCOLOR.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCCOLOR.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCCOLOR.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCCOLOR.C 2013-10-28 16:57:08.000000000 +0100 @@ -9,8 +9,8 @@ */ @@ -390,8 +390,8 @@ /* Private subobject */ Index: Papyrus3/JpegDir/JpgLossy/JDMARKER.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDMARKER.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDMARKER.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDMARKER.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDMARKER.C 2013-10-28 16:57:08.000000000 +0100 @@ -13,8 +13,8 @@ */ @@ -405,8 +405,8 @@ typedef enum { /* JPEG marker codes */ Index: Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCDCTMGR.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCDCTMGR.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,9 +12,9 @@ */ @@ -422,8 +422,8 @@ /* Private subobject for this module */ Index: Papyrus3/JpegDir/JpgLossy/CDJPEG.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/CDJPEG.H 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/CDJPEG.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/CDJPEG.H 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/CDJPEG.H 2013-10-28 16:57:08.000000000 +0100 @@ -11,10 +11,10 @@ #define JPEG_CJPEG_DJPEG /* define proper options in jconfig.h */ @@ -441,8 +441,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCMAINCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCMAINCT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCMAINCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCMAINCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCMAINCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -456,8 +456,8 @@ /* Note: currently, there is no operating mode in which a full-image buffer Index: Papyrus3/JpegDir/JpgLossy/JUTILS.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JUTILS.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JUTILS.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JUTILS.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JUTILS.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,8 +12,8 @@ */ @@ -471,8 +471,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JERROR.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JERROR.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JERROR.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JERROR.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JERROR.C 2013-10-28 16:57:08.000000000 +0100 @@ -19,10 +19,10 @@ */ @@ -499,8 +499,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JMEMNOBS.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JMEMNOBS.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C 2013-10-28 16:57:08.000000000 +0100 @@ -16,9 +16,9 @@ */ @@ -516,8 +516,8 @@ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLossy/JDAPISTD.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDAPISTD.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDAPISTD.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDAPISTD.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDAPISTD.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,8 +15,8 @@ */ @@ -531,8 +531,8 @@ /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLossy/JCOMAPI.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCOMAPI.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCOMAPI.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCOMAPI.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCOMAPI.C 2013-10-28 16:57:08.000000000 +0100 @@ -10,8 +10,8 @@ */ @@ -546,8 +546,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCMASTER.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCMASTER.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCMASTER.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCMASTER.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCMASTER.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,8 +12,8 @@ */ @@ -561,8 +561,8 @@ /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JINCLUDE.H =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JINCLUDE.H 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JINCLUDE.H 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JINCLUDE.H 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JINCLUDE.H 2013-10-28 16:57:08.000000000 +0100 @@ -17,7 +17,7 @@ /* Include auto-config file to find out which system include files we need. */ @@ -574,8 +574,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCPHUFF.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCPHUFF.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCPHUFF.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCPHUFF.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCPHUFF.C 2013-10-28 16:57:08.000000000 +0100 @@ -13,9 +13,9 @@ */ @@ -591,8 +591,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDMAINCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDMAINCT.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDMAINCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDMAINCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDMAINCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -14,8 +14,8 @@ */ @@ -606,8 +606,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCPARAM.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCPARAM.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCPARAM.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCPARAM.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCPARAM.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -621,8 +621,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JFDCTINT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JFDCTINT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JFDCTINT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTINT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JFDCTINT.C 2013-10-28 16:57:08.000000000 +0100 @@ -24,9 +24,9 @@ */ @@ -638,8 +638,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JCPREPCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCPREPCT.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCPREPCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCPREPCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCPREPCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,8 +15,8 @@ */ @@ -653,8 +653,8 @@ /* At present, jcsample.c can request context rows only for smoothing. Index: Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDDCTMGR.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDDCTMGR.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C 2013-10-28 16:57:08.000000000 +0100 @@ -16,9 +16,9 @@ */ @@ -670,8 +670,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/jmemmgr.c =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/jmemmgr.c 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/jmemmgr.c 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/jmemmgr.c 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/jmemmgr.c 2013-10-28 16:57:08.000000000 +0100 @@ -26,9 +26,9 @@ #define JPEG_INTERNALS @@ -687,8 +687,8 @@ #ifndef HAVE_STDLIB_H /* <stdlib.h> should declare getenv() */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTFST.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFST.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JIDCTFST.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFST.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JIDCTFST.C 2013-10-28 16:57:08.000000000 +0100 @@ -33,9 +33,9 @@ */ @@ -704,8 +704,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JIDCTINT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JIDCTINT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JIDCTINT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTINT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JIDCTINT.C 2013-10-28 16:57:08.000000000 +0100 @@ -26,9 +26,9 @@ */ @@ -721,8 +721,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDATADST.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDATADST.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDATADST.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDATADST.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDATADST.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,9 +15,9 @@ */ @@ -738,8 +738,8 @@ /* Expanded data destination object for stdio output */ Index: Papyrus3/JpegDir/JpgLossy/JDINPUT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDINPUT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDINPUT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDINPUT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDINPUT.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,8 +12,8 @@ */ @@ -753,8 +753,8 @@ /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JDCOLOR.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDCOLOR.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDCOLOR.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDCOLOR.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDCOLOR.C 2013-10-28 16:57:08.000000000 +0100 @@ -9,8 +9,8 @@ */ @@ -768,8 +768,8 @@ /* Private subobject */ Index: Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDAPIMIN.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDAPIMIN.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C 2013-10-28 16:57:08.000000000 +0100 @@ -17,8 +17,8 @@ */ @@ -783,8 +783,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JFDCTFST.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFST.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JFDCTFST.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFST.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JFDCTFST.C 2013-10-28 16:57:08.000000000 +0100 @@ -31,9 +31,9 @@ */ @@ -800,8 +800,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDSAMPLE.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDSAMPLE.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C 2013-10-28 16:57:08.000000000 +0100 @@ -19,8 +19,8 @@ */ @@ -815,8 +815,8 @@ /* Pointer to routine to upsample a single component */ Index: Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDPOSTCT.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDPOSTCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -17,8 +17,8 @@ */ @@ -830,8 +830,8 @@ /* Private buffer controller object */ Index: Papyrus3/JpegDir/JpgLossy/JQUANT2.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JQUANT2.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JQUANT2.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JQUANT2.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JQUANT2.C 2013-10-28 16:57:08.000000000 +0100 @@ -18,8 +18,8 @@ */ @@ -845,8 +845,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDATASRC.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDATASRC.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDATASRC.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDATASRC.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDATASRC.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,9 +15,9 @@ */ @@ -862,8 +862,8 @@ /* Expanded data source object for stdio input */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFLT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFLT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C 2013-10-28 16:57:08.000000000 +0100 @@ -37,9 +37,9 @@ */ @@ -879,8 +879,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JCINIT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCINIT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCINIT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCINIT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCINIT.C 2013-10-28 16:57:08.000000000 +0100 @@ -16,8 +16,8 @@ */ @@ -894,8 +894,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDCOLMAP.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDCOLMAP.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C 2013-10-28 16:57:08.000000000 +0100 @@ -21,7 +21,7 @@ * currently implemented. */ @@ -907,8 +907,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCAPIMIN.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCAPIMIN.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C 2013-10-28 16:57:08.000000000 +0100 @@ -17,8 +17,8 @@ */ @@ -922,8 +922,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCMARKER.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCMARKER.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCMARKER.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCMARKER.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCMARKER.C 2013-10-28 16:57:08.000000000 +0100 @@ -9,8 +9,8 @@ */ @@ -937,8 +937,8 @@ typedef enum { /* JPEG marker codes */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTRED.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JIDCTRED.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JIDCTRED.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTRED.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JIDCTRED.C 2013-10-28 16:57:08.000000000 +0100 @@ -21,9 +21,9 @@ */ @@ -954,8 +954,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDHUFF.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDHUFF.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDHUFF.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDHUFF.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDHUFF.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,9 +15,9 @@ */ @@ -971,8 +971,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCCOEFCT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCCOEFCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -986,8 +986,8 @@ /* We use a full-image coefficient buffer when doing Huffman optimization, Index: Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFLT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFLT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C 2013-10-28 16:57:08.000000000 +0100 @@ -35,9 +35,9 @@ */ @@ -1003,8 +1003,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDCOEFCT.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDCOEFCT.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,8 +15,8 @@ */ @@ -1018,8 +1018,8 @@ #ifndef D_PROGRESSIVE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDMERGE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDMERGE.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDMERGE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDMERGE.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDMERGE.C 2013-10-28 16:57:08.000000000 +0100 @@ -33,8 +33,8 @@ */ @@ -1033,8 +1033,8 @@ Index: Papyrus3/JpegDir/JpgLossy/JCAPISTD.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCAPISTD.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCAPISTD.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCAPISTD.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCAPISTD.C 2013-10-28 16:57:08.000000000 +0100 @@ -15,8 +15,8 @@ */ @@ -1048,8 +1048,8 @@ /* Index: Papyrus3/JpegDir/JpgLossy/JQUANT1.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JQUANT1.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JQUANT1.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JQUANT1.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JQUANT1.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -1063,8 +1063,8 @@ Index: Papyrus3/JpegDir/JpgLossy/RDRLE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDRLE.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDRLE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDRLE.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDRLE.C 2013-10-28 16:57:08.000000000 +0100 @@ -19,7 +19,7 @@ * with updates from Robert Hutchinson. */ @@ -1076,8 +1076,8 @@ Index: Papyrus3/JpegDir/JpgLossy/RDGIF.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDGIF.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDGIF.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDGIF.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDGIF.C 2013-10-28 16:57:08.000000000 +0100 @@ -19,7 +19,7 @@ * CompuServe Incorporated." */ @@ -1089,8 +1089,8 @@ Index: Papyrus3/JpegDir/JpgLossy/RDTARGA.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDTARGA.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDTARGA.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDTARGA.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDTARGA.C 2013-10-28 16:57:08.000000000 +0100 @@ -17,7 +17,7 @@ * Based on code contributed by Lee Daniel Crocker. */ @@ -1102,8 +1102,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JDTRANS.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JDTRANS.C 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JDTRANS.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JDTRANS.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JDTRANS.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -1117,8 +1117,8 @@ /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLossy/RDSWITCH.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDSWITCH.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDSWITCH.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDSWITCH.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDSWITCH.C 2013-10-28 16:57:08.000000000 +0100 @@ -13,7 +13,7 @@ * -sample HxV[,HxV,...] Set component sampling factors */ @@ -1130,8 +1130,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/RDBMP.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDBMP.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDBMP.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDBMP.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDBMP.C 2013-10-28 16:57:08.000000000 +0100 @@ -21,7 +21,7 @@ * This code contributed by James Arthur Boucher. */ @@ -1143,8 +1143,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/WRRLE.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/WRRLE.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/WRRLE.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/WRRLE.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/WRRLE.C 2013-10-28 16:57:08.000000000 +0100 @@ -16,7 +16,7 @@ * with updates from Robert Hutchinson. */ @@ -1156,8 +1156,8 @@ Index: Papyrus3/JpegDir/JpgLossy/RDPPM.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/RDPPM.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/RDPPM.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/RDPPM.C 2013-10-28 16:57:01.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/RDPPM.C 2013-10-28 16:57:08.000000000 +0100 @@ -18,7 +18,7 @@ * the file is indeed PPM format). */ @@ -1169,8 +1169,8 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCTRANS.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLossy/JCTRANS.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLossy/JCTRANS.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLossy/JCTRANS.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLossy/JCTRANS.C 2013-10-28 16:57:08.000000000 +0100 @@ -11,8 +11,8 @@ */ @@ -1184,8 +1184,8 @@ /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLless/JPEGUTIL.C =================================================================== ---- Papyrus3.orig/JpegDir/JpgLless/JPEGUTIL.C 2013-10-28 16:47:58.000000000 +0100 -+++ Papyrus3/JpegDir/JpgLless/JPEGUTIL.C 2013-10-28 16:48:31.000000000 +0100 +--- Papyrus3.orig/JpegDir/JpgLless/JPEGUTIL.C 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/JpegDir/JpgLless/JPEGUTIL.C 2013-10-28 16:57:08.000000000 +0100 @@ -37,21 +37,17 @@ #include <stdlib.h> #include <string.h> Modified: trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch 2013-10-28 16:00:27 UTC (rev 15026) @@ -4,8 +4,8 @@ Index: Papyrus3/Makefile.PC =================================================================== ---- Papyrus3.orig/Makefile.PC 2013-10-28 16:46:30.000000000 +0100 -+++ Papyrus3/Makefile.PC 2013-10-28 16:47:38.000000000 +0100 +--- Papyrus3.orig/Makefile.PC 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/Makefile.PC 2013-10-28 16:57:05.000000000 +0100 @@ -5,6 +5,7 @@ MANDIR= $(DSTDIR)/man JPEGDIRLL= JpegDir/JpgLless @@ -25,8 +25,8 @@ Index: Papyrus3/Makefile =================================================================== ---- Papyrus3.orig/Makefile 2013-10-28 16:46:30.000000000 +0100 -+++ Papyrus3/Makefile 2013-10-28 16:47:38.000000000 +0100 +--- Papyrus3.orig/Makefile 2013-10-28 16:57:02.000000000 +0100 ++++ Papyrus3/Makefile 2013-10-28 16:57:05.000000000 +0100 @@ -13,7 +13,7 @@ INSTALLDIR= /home/Dorad/dorad/bin Modified: trunk/packages/papyrus/trunk/debian/patches/hardening.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/hardening.patch 2013-10-28 15:59:36 UTC (rev 15025) +++ trunk/packages/papyrus/trunk/debian/patches/hardening.patch 2013-10-28 16:00:27 UTC (rev 15026) @@ -4,8 +4,8 @@ Index: Papyrus3/PapyError3.c =================================================================== ---- Papyrus3.orig/PapyError3.c 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/PapyError3.c 2013-10-28 16:48:41.000000000 +0100 +--- Papyrus3.orig/PapyError3.c 2013-10-28 16:57:00.000000000 +0100 ++++ Papyrus3/PapyError3.c 2013-10-28 16:57:13.000000000 +0100 @@ -168,7 +168,7 @@ #ifndef DLL PapyShort i, theMax, theNb = 0; @@ -26,8 +26,8 @@ } /* endof PapyPrintErrMsg3 */ Index: Papyrus3/TESTS/TestRead.c =================================================================== ---- Papyrus3.orig/TESTS/TestRead.c 2013-10-28 16:47:57.000000000 +0100 -+++ Papyrus3/TESTS/TestRead.c 2013-10-28 16:48:41.000000000 +0100 +--- Papyrus3.orig/TESTS/TestRead.c 2013-10-28 16:57:00.000000000 +0100 ++++ Papyrus3/TESTS/TestRead.c 2013-10-28 16:57:13.000000000 +0100 @@ -53,6 +53,7 @@ #define MAIN _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit