debian/0000755000000000000000000000000012233505654007173 5ustar debian/rules0000755000000000000000000000015712233476676010271 0ustar #!/usr/bin/make -f %: dh $@ --buildsystem=cmake get-orig-source: uscan --verbose --force-download --rename debian/watch0000644000000000000000000000010012233141303010176 0ustar version=3 http://sf.net/jpeg/Papyrus([\d])([\d])([\d])\.tar\.gz debian/changelog0000644000000000000000000000023312233501441011031 0ustar papyrus (3.7.1-1) unstable; urgency=low * Initial release. (Closes: #728111) -- Mathieu Malaterre Mon, 28 Oct 2013 16:29:59 +0100 debian/README.Debian0000644000000000000000000000026412233505033011225 0ustar The build system has been replaced with a cmake based one. Since maintainer is more confortable with it. -- Mathieu Malaterre Mon, 28 Oct 2013 16:29:59 +0100 debian/control0000644000000000000000000000230512233505650010572 0ustar Source: papyrus Maintainer: Debian Med Packaging Team Uploaders: Mathieu Malaterre Section: libdevel Priority: optional Standards-Version: 3.9.4 Homepage: http://www.expasy.ch/www/UIN/UIN.html Build-Depends: debhelper (>= 9), cmake (>= 2.8.2) Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/papyrus/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/papyrus/trunk/ Package: libpapyrus3-dev Architecture: any Depends: ${misc:Depends} Description: DICOM compatible file format library PAPYRUS 3.0 file format based on the new DICOM 3.0 Standard addresses the open interchange of medical images in files or on removable storage media. This specific implementation of the DICOM standard is intended as a generic solution for interchange of multi-modality medical images on removable media. It can also be used for convenient exchange of image data between different computer systems through industry standard file transfer mechanisms. Finally it can also be used for storage and archival of medical image data in a DICOM compatible format. . This package contains the libraries needed to run PAPYRUS 3.0 applications. debian/copyright0000644000000000000000000000621112233476676011141 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: PAPYRUS Toolkit Upstream-Contact: GIRARD Christian Source: http://www.expasy.ch/UIN/html1/projects/papyrus/papyrus.html Files: * Copyright: © 2004 - Service of Medical Informatics - University Hospitals of Geneva (HUG), Geneva, Switzerland License: LGPL-2.1 Files: JpegDir/JpgLossy/* Copyright: © 1995-1997, Thomas G. Lane. License: Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for any purpose, without fee, subject to these conditions: (1) If any part of the source code for this software is distributed, then this README file must be included, with this copyright and no-warranty notice unaltered; and any additions, deletions, or changes to the original files must be clearly indicated in accompanying documentation. (2) If only executable code is distributed, then the accompanying documentation must state that "this software is based in part on the work of the Independent JPEG Group". (3) Permission for use of this software is granted only if the user accepts full responsibility for any undesirable consequences; the authors accept NO LIABILITY for damages of any kind. Files: JpegDir/JpgLless/* Copyright: © 1994 Kongji Huang and Brian C. Smith. Cornell University License: Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without written agreement is hereby granted, provided that the above copyright notice and the following two paragraphs appear in all copies of this software. . IN NO EVENT SHALL CORNELL UNIVERSITY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF CORNELL UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. . CORNELL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND CORNELL UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Files: debian/* Copyright: 2013; Mathieu Malaterre License: LGPL-2.1 License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; version 2.1 of the License . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems the full text of the GNU Library General Public License can be found in the `/usr/share/common-licenses/LGPL-2.1' file. debian/source/0000755000000000000000000000000012233505654010473 5ustar debian/source/format0000644000000000000000000000001412233141303011664 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212233141303010354 0ustar 9 debian/README.source0000644000000000000000000000074512233505033011347 0ustar This is an old piece of software (legacy). However since we are dealing with medical data, a lot of data are still around since 10 years of archive (minimum) is required in most countries. One should not continue in using this format anymore, but instead should use 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 Mon, 28 Oct 2013 16:29:59 +0100 debian/patches/0000755000000000000000000000000012233505654010622 5ustar debian/patches/addcmake.patch0000644000000000000000000001761012233505033013370 0ustar Description: Prefer a CMake based build system Author: Mathieu Malaterre Forwarded: no 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:57:15.000000000 +0100 @@ -0,0 +1,18 @@ +# JpgLless +set(SOURCES + decompoptimise.c + huffcoptimisebug.c + huffdoptimise.c + JPEGUTIL.C + MCU.C + pmreadoptimise.c + pnmtoljpoptimisebug.c + PREDICT.C + READ.C + WRITE.C + ) +set_source_files_properties(PROTO.H PROPERTIES LANGUAGE C) + +add_library(JpgLless ${SOURCES}) +set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) +set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C) Index: Papyrus3/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ Papyrus3/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,176 @@ +# Copyright Mathieu Malaterre +# LGPL-2.1 +cmake_minimum_required(VERSION 2.8) +project(Papyrus3 C) + +set(JPEGDIRLL JpegDir/JpgLless) +set(JPEGDIRLY JpegDir/JpgLossy) +set(DICOMDIR DicomDir) + +#set(BUILD_SHARED_LIBS ON) + +include_directories( + ${JPEGDIRLL} + ${JPEGDIRLY} + ${DICOMDIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +set(SOURCES + PapyVars3.c + PapyConvertFile3.c + PapyError3.c + PapyFiles3.c + PapyGetGlobalVar3.c + PapyInit3.c + PapyInitGroups3.c + PapyInitModules3.c + PapyRead3.c + PapyDataSetRead3.c + PapyList3.c + PapyWrite3.c + PapyDataSetWrite3.c + PapyWild3.c + PapyWildexit3.c + PapyUtils3.c + ) +set(HEADERS + PapyEalloc3.h + PapyEnumGroups3.h + PapyEnumImageGroups3.h + PapyEnumImagesModules3.h + PapyEnumMiscGroups3.h + PapyEnumMiscModules3.h + PapyEnumModules3.h + PapyError3.h + PapyErrorMacros3.h + PapyFileSystem3.h + PapyGlobalVar3.h + PapyInitModules3.h + PapyPrivFunctionDef3.h + PapyPubFunctionDef3.h + Papyrus3.h + PapyTypeDef3.h + PapyWild3.h + ) +if(UNIX) + list(APPEND SOURCES PapyFileSystemUnix3.c PapyEallocUnix3.c) +endif() +if(WIN32) + list(APPEND SOURCES PapyFileSystemPC3.c PapyEallocPC3.c) +endif() + +list(APPEND SOURCES + DicomDir/DicomDirDataSetRead.c + DicomDir/DicomDirDataSetWrite.c + DicomDir/DicomDirFiles.c + DicomDir/DicomDirInit.c + DicomDir/DicomDirInitRecords.c + DicomDir/OGlobalDicomFunc.cpp + ) +list(APPEND HEADERS + DicomDir/DicomDir.h + DicomDir/DicomDirEnumRecords.h + DicomDir/DicomdirGlobalVar3.h + DicomDir/DicomDirInitRecords.h + DicomDir/DicomdirPrivFunctionDef3.h + DicomDir/DicomdirPubFunctionDef3.h + DicomDir/DicomdirTypeDef3.h + DicomDir/OGlobalDicomFunc.h + ) +list(APPEND SOURCES + JpegDir/JpgLless/decompoptimise.c + JpegDir/JpgLless/huffcoptimisebug.c + JpegDir/JpgLless/huffdoptimise.c + JpegDir/JpgLless/JPEGUTIL.C + JpegDir/JpgLless/MCU.C + JpegDir/JpgLless/pmreadoptimise.c + JpegDir/JpgLless/pnmtoljpoptimisebug.c + JpegDir/JpgLless/PREDICT.C + JpegDir/JpgLless/READ.C + JpegDir/JpgLless/WRITE.C + ) +set_source_files_properties( + JpegDir/JpgLless/IO.H + JpegDir/JpgLless/JPEG.H + JpegDir/JpgLless/JPEGLESS.H + JpegDir/JpgLless/MCU.H + JpegDir/JpgLless/PREDICT.H + JpegDir/JpgLless/PROTO.H + PROPERTIES LANGUAGE C) + +list(APPEND SOURCES + JpegDir/JpgLossy/JCAPIMIN.C + JpegDir/JpgLossy/JCAPISTD.C + JpegDir/JpgLossy/JCCOEFCT.C + JpegDir/JpgLossy/JCCOLOR.C + JpegDir/JpgLossy/JCDCTMGR.C + JpegDir/JpgLossy/JCHUFF.C + JpegDir/JpgLossy/JCINIT.C + JpegDir/JpgLossy/JCMAINCT.C + JpegDir/JpgLossy/JCMARKER.C + JpegDir/JpgLossy/JCMASTER.C + JpegDir/JpgLossy/JCOMAPI.C + JpegDir/JpgLossy/JCPARAM.C + JpegDir/JpgLossy/JCPHUFF.C + JpegDir/JpgLossy/JCPREPCT.C + JpegDir/JpgLossy/JCSAMPLE.C + JpegDir/JpgLossy/JCTRANS.C + JpegDir/JpgLossy/JDAPIMIN.C + JpegDir/JpgLossy/JDAPISTD.C + JpegDir/JpgLossy/JDATADST.C + JpegDir/JpgLossy/JDATASRC.C + JpegDir/JpgLossy/JDCOEFCT.C + JpegDir/JpgLossy/JDCOLOR.C + JpegDir/JpgLossy/JDDCTMGR.C + JpegDir/JpgLossy/JDHUFF.C + JpegDir/JpgLossy/JDINPUT.C + JpegDir/JpgLossy/JDMAINCT.C + JpegDir/JpgLossy/JDMARKER.C + JpegDir/JpgLossy/JDMASTER.C + JpegDir/JpgLossy/JDMERGE.C + JpegDir/JpgLossy/JDPHUFF.C + JpegDir/JpgLossy/JDPOSTCT.C + JpegDir/JpgLossy/JDSAMPLE.C + JpegDir/JpgLossy/JDTRANS.C + JpegDir/JpgLossy/JERROR.C + JpegDir/JpgLossy/JFDCTFLT.C + JpegDir/JpgLossy/JFDCTFST.C + JpegDir/JpgLossy/JFDCTINT.C + JpegDir/JpgLossy/JIDCTFLT.C + JpegDir/JpgLossy/JIDCTFST.C + JpegDir/JpgLossy/JIDCTINT.C + JpegDir/JpgLossy/JIDCTRED.C + JpegDir/JpgLossy/jmemmgr.c + JpegDir/JpgLossy/JMEMNOBS.C + JpegDir/JpgLossy/JQUANT1.C + JpegDir/JpgLossy/JQUANT2.C + JpegDir/JpgLossy/JUTILS.C + JpegDir/JpgLossy/RDBMP.C + JpegDir/JpgLossy/RDCOLMAP.C + JpegDir/JpgLossy/RDGIF.C + JpegDir/JpgLossy/RDPPM.C + JpegDir/JpgLossy/RDRLE.C + JpegDir/JpgLossy/RDSWITCH.C + JpegDir/JpgLossy/RDTARGA.C + JpegDir/JpgLossy/WRRLE.C + ) + +add_library(Papyrus3 ${SOURCES}) +# http://bugs.debian.org/728108 +set_target_properties(Papyrus3 PROPERTIES COMPILE_FLAGS "-x c") +set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) +set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C) + +add_subdirectory(TESTS) + +install(TARGETS Papyrus3 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + +install(FILES + ${HEADERS} + DESTINATION include/Papyrus3 + ) 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:57:15.000000000 +0100 @@ -0,0 +1,52 @@ +# JpgLossy +set(SOURCES + JCAPIMIN.C + JCAPISTD.C + JCCOEFCT.C + JCCOLOR.C + JCDCTMGR.C + JCHUFF.C + JCINIT.C + JCMAINCT.C + JCMASTER.C + JCMARKER.C + JCOMAPI.C + JCPARAM.C + JCPHUFF.C + JCPREPCT.C + JCSAMPLE.C + JDAPIMIN.C + JDAPISTD.C + JDATADST.C + JDATASRC.C + JDCOEFCT.C + JDCOLOR.C + JDDCTMGR.C + JDHUFF.C + JDINPUT.C + JDMAINCT.C + JDMARKER.C + JDMASTER.C + JDMERGE.C + JDPHUFF.C + JDPOSTCT.C + JDSAMPLE.C + JERROR.C + JFDCTINT.C + JFDCTFLT.C + JFDCTFST.C + JIDCTFLT.C + JIDCTFST.C + JIDCTINT.C + JIDCTRED.C + jmemmgr.c + JMEMNOBS.C + JQUANT1.C + JQUANT2.C + JUTILS.C + RDCOLMAP.C + ) + +add_library(JpgLossy ${SOURCES}) +set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) +set_target_properties(JpgLossy PROPERTIES LINKER_LANGUAGE C) Index: Papyrus3/DicomDir/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ Papyrus3/DicomDir/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,35 @@ +# DicomDir +set(SOURCES + DicomDirDataSetRead.c + DicomDirDataSetWrite.c + DicomDirFiles.c + DicomDirInit.c + DicomDirInitRecords.c + OGlobalDicomFunc.cpp + ) +#set_source_files_properties(OGlobalDicomFunc.cpp PROPERTIES LANGUAGE "C") + +set(HEADERS + DicomDir.h + DicomDirEnumRecords.h + DicomdirGlobalVar3.h + DicomDirInitRecords.h + DicomdirPrivFunctionDef3.h + DicomdirPubFunctionDef3.h + DicomdirTypeDef3.h + OGlobalDicomFunc.h + ) + +add_library(DicomDir ${SOURCES}) +set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) +set_target_properties(DicomDir PROPERTIES LINKER_LANGUAGE C) + +#install(TARGETS Papyrus3 +# RUNTIME DESTINATION bin +# LIBRARY DESTINATION lib +# ARCHIVE DESTINATION lib +# ) +# +#install(FILES +# DESTINATION include/Papyrus3 +# ) Index: Papyrus3/TESTS/CMakeLists.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ Papyrus3/TESTS/CMakeLists.txt 2013-10-28 16:57:15.000000000 +0100 @@ -0,0 +1,8 @@ +# Tests +add_executable(TestRead TestRead.c) +target_link_libraries(TestRead Papyrus3) +set_source_files_properties(TestRead.c PROPERTIES LANGUAGE C) + +#add_executable(TestWrite TestWrite.c) +#target_link_libraries(TestWrite Papyrus3) +#set_source_files_properties(TestWrite.c PROPERTIES LANGUAGE C) debian/patches/fixmakefiles.patch0000644000000000000000000000300012233505033014272 0ustar Description: Fix issues with default Makefile build system Author: Mathieu Malaterre Forwarded: no Index: Papyrus3/Makefile.PC =================================================================== --- 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 JPEGDIRLY= JpegDir/JpgLossy +DICOMDIR= DicomDir MAYODIR= Mayo BINDIR= $(DSTDIR)/test LIBDIR= $(DSTDIR)/$(ARCH)/lib @@ -12,7 +13,7 @@ INCPAPYRUS2DIR= ../Papyrus2 LIBPAPYRUS2DIR= ../Papyrus2/$(ARCH)/lib -CPPFLAGS= -I. -I../.. -I$(INCPAPYRUS2DIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) -D_NO_LONGLONG +CPPFLAGS= -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) -D_NO_LONGLONG CFLAGS= -g LINTFLAGS= -hb Index: Papyrus3/Makefile =================================================================== --- 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 -CPPFLAGS= -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) -D_NO_LONGLONG -DSolaris +CPPFLAGS= -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) -D_NO_LONGLONG -DSolaris -DHAVE_BOOLEAN CFLAGS= -g LINTFLAGS= -hb @@ -65,7 +65,7 @@ -rm -Rf $(ARCH); cd JpegDir/JpgLless;make clean; cd JpegDir/JpgLossy;make clean; - cd DicomDir;make clean + cd DicomDir;#make clean .KEEP_STATE: debian/patches/fixcmake.patch0000644000000000000000000000201512233504315013421 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . papyrus (3.7.1-1) unstable; urgency=low . * Initial release. (Closes: #) Author: Mathieu Malaterre --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: debian/patches/fixcxx.patch0000644000000000000000000005222612233504315013154 0ustar Description: Track down an issue with CMake trying to compile in C++ when specified C Author: Mathieu Malaterre Forwarded: no Bug-Debian: http://bugs.debian.org/728108 --- papyrus-3.7.1.orig/PapyFileSystemUnix3.c +++ papyrus-3.7.1/PapyFileSystemUnix3.c @@ -78,13 +78,9 @@ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef __PapyError3__ #include "PapyError3.h" -#endif /********************************************************************************/ --- papyrus-3.7.1.orig/PapyWild3.c +++ papyrus-3.7.1/PapyWild3.c @@ -100,7 +100,7 @@ wildname (register char *inNameP) } /* if */ - return (theSaved [0] == '\0') ? "?" : theSaved; + return (theSaved [0] == '\0') ? (char*)"?" : theSaved; } /* endof wildname */ --- papyrus-3.7.1.orig/PapyConvertFile3.c +++ papyrus-3.7.1/PapyConvertFile3.c @@ -64,9 +64,7 @@ #include "JPEGLESS.H" /* interface for JPEG lossless */ #include "JPEGLIB.H" /* interface for JPEG lossy */ -#ifndef Papyrus3H #include "Papyrus3.h" -#endif struct color /* a color is defined by its red, green and blue intensity */ @@ -1482,9 +1480,11 @@ int Papyrus2Jpeg (char *inPapyrusFilenam /* Attention voir pour resize 16 bits et 3 * 8 bits*/ /* resize image */ +#if 0 if (imageHeight != inJpegHeight || imageWidth != inJpegWidth) image=TI_taille(image, imageWidth, imageHeight, inJpegWidth, inJpegHeight, imageDepth, numPlans, &bytesInImage); +#endif sprintf(jpegFilename,"%s.%d_%d.jpg",outJpegBaseFilename, dimImageJpeg, noImage); --- papyrus-3.7.1.orig/PapyInitGroups3.c +++ papyrus-3.7.1/PapyInitGroups3.c @@ -63,9 +63,7 @@ #include -#ifndef Papyrus3H #include "Papyrus3.h" -#endif @@ -404,7 +402,7 @@ init_group8 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -1548,7 +1546,7 @@ init_group10 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -1892,7 +1890,7 @@ init_group18 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -5156,7 +5154,7 @@ init_group20 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -5731,7 +5729,7 @@ init_group28 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6585,7 +6583,7 @@ init_group32 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6859,7 +6857,7 @@ init_group38 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -7093,7 +7091,7 @@ init_group3A (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -7367,7 +7365,7 @@ init_group40 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -8907,7 +8905,7 @@ init_group50 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -9011,7 +9009,7 @@ init_group54 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -9889,7 +9887,7 @@ init_group70 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -10273,7 +10271,7 @@ init_group88 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -10366,7 +10364,7 @@ init_group100 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -10430,7 +10428,7 @@ init_group2000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -10664,7 +10662,7 @@ init_group2010 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -10928,7 +10926,7 @@ init_group2020 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11062,7 +11060,7 @@ init_group2030 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11106,7 +11104,7 @@ init_group2040 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11304,7 +11302,7 @@ init_group2100 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11418,7 +11416,7 @@ init_group2110 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11482,7 +11480,7 @@ init_group2120 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11536,7 +11534,7 @@ init_group2130 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11650,7 +11648,7 @@ init_group3002 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -11864,7 +11862,7 @@ init_group3004 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -12583,7 +12581,7 @@ init_group3008 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -13367,7 +13365,7 @@ init_group300A (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -15982,7 +15980,7 @@ init_group4000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = RET; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16026,7 +16024,7 @@ init_group4008 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16320,7 +16318,7 @@ init_group5000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16604,7 +16602,7 @@ init_group5400 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16698,7 +16696,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16868,7 +16866,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16878,7 +16876,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16888,7 +16886,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16898,7 +16896,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16908,7 +16906,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16918,7 +16916,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16928,7 +16926,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -16938,7 +16936,7 @@ init_group6000 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -17299,7 +17297,7 @@ init_group7FE0 (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = UL; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; --- papyrus-3.7.1.orig/PapyInitModules3.c +++ papyrus-3.7.1/PapyInitModules3.c @@ -6835,7 +6835,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6845,7 +6845,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6855,7 +6855,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6865,7 +6865,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6875,7 +6875,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6885,7 +6885,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6895,7 +6895,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; @@ -6905,7 +6905,7 @@ init_OverlayPlane (SElement ioElem []) theWrkP->length = 0L; theWrkP->vr = USS; theWrkP->vm = "1-n"; - theWrkP->type_t = RET; + theWrkP->type_t = (enum EType_T)RET; theWrkP->nb_val = 0; theWrkP->value = NULL; --- papyrus-3.7.1.orig/JpegDir/JpgLless/huffcoptimisebug.c +++ papyrus-3.7.1/JpegDir/JpgLless/huffcoptimisebug.c @@ -53,17 +53,11 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/JPEGLESS.H +++ papyrus-3.7.1/JpegDir/JpgLless/JPEGLESS.H @@ -57,9 +57,7 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/maindecompression.c +++ papyrus-3.7.1/JpegDir/JpgLless/maindecompression.c @@ -13,17 +13,11 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ @@ -332,4 +326,4 @@ efree3(&image); printf("Sortie a fin de programme... \n"); -} \ No newline at end of file +} --- papyrus-3.7.1.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c +++ papyrus-3.7.1/JpegDir/JpgLless/pnmtoljpoptimisebug.c @@ -50,17 +50,11 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/IO.H +++ papyrus-3.7.1/JpegDir/JpgLless/IO.H @@ -36,9 +36,7 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/maincompression.c +++ papyrus-3.7.1/JpegDir/JpgLless/maincompression.c @@ -18,17 +18,11 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ @@ -215,4 +209,4 @@ Papy3FClose (&OutFile); efree3 (&ImageBuffer); efree3 (&JPEGData); -} \ No newline at end of file +} --- papyrus-3.7.1.orig/JpegDir/JpgLless/decompoptimise.c +++ papyrus-3.7.1/JpegDir/JpgLless/decompoptimise.c @@ -59,17 +59,11 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/huffdoptimise.c +++ papyrus-3.7.1/JpegDir/JpgLless/huffdoptimise.c @@ -51,9 +51,7 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/pmreadoptimise.c +++ papyrus-3.7.1/JpegDir/JpgLless/pmreadoptimise.c @@ -40,13 +40,9 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/JpegDir/JpgLless/PROTO.H +++ papyrus-3.7.1/JpegDir/JpgLless/PROTO.H @@ -46,9 +46,7 @@ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyTypeDef3H #include "PapyTypeDef3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ @@ -75,7 +73,7 @@ PapyULong WriteJpegData P((PapyUChar *bu void StdPickSelValue P((CompressInfo *cPtr, long *bestTotalBits)); /* read.c */ -int ReadFileHeader P((DecompressInfo *dcPtr )); +int ReadFileHeader (DecompressInfo *dcPtr ); int ReadScanHeader P((DecompressInfo *dcPtr )); /* write.c */ --- papyrus-3.7.1.orig/DicomDir/DicomDirDataSetRead.c +++ papyrus-3.7.1/DicomDir/DicomDirDataSetRead.c @@ -55,9 +55,7 @@ #include #include -#ifndef DicomdirH #include "DicomDir.h" -#endif /********************************************************************************/ --- papyrus-3.7.1.orig/DicomDir/DicomDirInit.c +++ papyrus-3.7.1/DicomDir/DicomDirInit.c @@ -53,15 +53,11 @@ #include -#ifndef DicomdirH #include "DicomDir.h" -#endif #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef DicomdirInitRecordsH #include "DicomDirInitRecords.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/DicomDir/DicomDir.h +++ papyrus-3.7.1/DicomDir/DicomDir.h @@ -56,29 +56,17 @@ #ifndef DicomdirH #define DicomdirH -#ifndef Papyrus3H #include "Papyrus3.h" -#endif /* --- includes --- */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef DicomdirEnumRecordsH #include "DicomDirEnumRecords.h" -#endif -#ifndef DicomdirTypeDef3H /* DICOMDIR type definition */ #include "DicomdirTypeDef3.h" -#endif -#ifndef DicomdirPrivFunctionDef3H /* DICOMDIR private functions */ #include "DicomdirPrivFunctionDef3.h" -#endif -#ifndef DicomdirPubFunctionDef3H /* DICOMDIR public functions */ #include "DicomdirPubFunctionDef3.h" -#endif -#ifndef DicomdirGlobalVar3H /* DICOMDIR global variables */ #include "DicomdirGlobalVar3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ --- papyrus-3.7.1.orig/DicomDir/DicomDirDataSetWrite.c +++ papyrus-3.7.1/DicomDir/DicomDirDataSetWrite.c @@ -56,9 +56,7 @@ /* ------------------------- includes -----------------------------------------*/ -#ifndef DicomdirH #include "DicomDir.h" -#endif /********************************************************************************/ --- papyrus-3.7.1.orig/DicomDir/DicomDirFiles.c +++ papyrus-3.7.1/DicomDir/DicomDirFiles.c @@ -55,9 +55,7 @@ #include #include -#ifndef DicomdirH #include "DicomDir.h" -#endif #ifdef _WINDOWS --- papyrus-3.7.1.orig/DicomDir/DicomDirInitRecords.c +++ papyrus-3.7.1/DicomDir/DicomDirInitRecords.c @@ -54,9 +54,7 @@ #include -#ifndef DicomdirH #include "DicomDir.h" -#endif /********************************************************************************/ debian/patches/series0000644000000000000000000000011612233504315012026 0ustar fixmakefiles.patch fixcase.patch hardening.patch #fixcxx.patch addcmake.patch debian/patches/fixcase.patch0000644000000000000000000011716112233505033013263 0ustar Description: Fix issues with case sensitive file systems Author: Mathieu Malaterre Forwarded: no Index: Papyrus3/JpegDir/JpgLless/MCU.C =================================================================== --- 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 /* #include */ #include -#include "jpeg.h" -#include "mcu.h" -#include "proto.h" +#include "JPEG.H" +#include "MCU.H" +#include "PROTO.H" /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/WRITE.C =================================================================== --- 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 */ #include -#include "jpeg.h" -#include "mcu.h" -#include "io.h" -#include "proto.h" +#include "JPEG.H" +#include "MCU.H" +#include "IO.H" +#include "PROTO.H" /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLless/READ.C =================================================================== --- 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 #include #include -#include "jpeg.h" -#include "mcu.h" -#include "io.h" -#include "proto.h" +#include "JPEG.H" +#include "MCU.H" +#include "IO.H" +#include "PROTO.H" /* * 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:57:02.000000000 +0100 +++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 16:57:08.000000000 +0100 @@ -42,10 +42,10 @@ #include #include -#include "jpeg.h" -#include "mcu.h" -#include "proto.h" -#include "jpegless.h" +#include "JPEG.H" +#include "MCU.H" +#include "PROTO.H" +#include "JPEGLESS.H" /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLless/pmreadoptimise.c =================================================================== --- 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. */ #include -#include "jpeg.h" -#include "mcu.h" -#include "proto.h" -#include "jpegless.h" -#include "io.h" +#include "JPEG.H" +#include "MCU.H" +#include "PROTO.H" +#include "JPEGLESS.H" +#include "IO.H" /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/PREDICT.C =================================================================== --- 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 @@ */ #include -#include "mcu.h" +#include "MCU.H" #ifdef DEBUG /* Index: Papyrus3/PapyConvertFile3.c =================================================================== --- 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 -#include "jpegless.h" /* interface for JPEG lossless */ -#include "jpeglib.h" /* interface for JPEG lossy */ +#include "JPEGLESS.H" /* interface for JPEG lossless */ +#include "JPEGLIB.H" /* interface for JPEG lossy */ #ifndef Papyrus3H #include "Papyrus3.h" Index: Papyrus3/JpegDir/JpgLless/JPEGLESS.H =================================================================== --- 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 */ -#include "jpeg.h" +#include "JPEG.H" /* Global variables for lossless encoding process */ Index: Papyrus3/JpegDir/JpgLossy/JPEGLIB.H =================================================================== --- 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 @@ */ #ifndef JCONFIG_INCLUDED /* in case jinclude.h already did */ -#include "jconfig.h" /* widely used configuration options */ +#include "JCONFIG.H" /* widely used configuration options */ #endif -#include "jmorecfg.h" /* seldom changed options */ +#include "JMORECFG.H" /* seldom changed options */ /* Papyrus 3 redefined basic types */ @@ -1128,8 +1128,8 @@ */ #ifdef JPEG_INTERNALS -#include "jpegint.h" /* fetch private declarations */ -#include "jerror.h" /* fetch error codes too */ +#include "JPEGINT.H" /* fetch private declarations */ +#include "JERROR.H" /* fetch error codes too */ #endif #endif /* JPEGLIB_H */ Index: Papyrus3/DicomDir/DicomDir.h =================================================================== --- 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 #ifndef DicomdirTypeDef3H /* DICOMDIR type definition */ -#include "DicomDirTypeDef3.h" +#include "DicomdirTypeDef3.h" #endif #ifndef DicomdirPrivFunctionDef3H /* DICOMDIR private functions */ -#include "DicomDirPrivFunctionDef3.h" +#include "DicomdirPrivFunctionDef3.h" #endif #ifndef DicomdirPubFunctionDef3H /* DICOMDIR public functions */ -#include "DicomDirPubFunctionDef3.h" +#include "DicomdirPubFunctionDef3.h" #endif #ifndef DicomdirGlobalVar3H /* DICOMDIR global variables */ -#include "DicomDirGlobalVar3.h" +#include "DicomdirGlobalVar3.h" #endif #else /* FILENAME83 defined for the DOS machines */ Index: Papyrus3/PapyRead3.c =================================================================== --- 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 #include "setjmp.h" -#include "jpegless.h" /* interface for JPEG lossless decompressor */ -#include "jpeglib.h" /* interface for JPEG lossy decompressor */ +#include "JPEGLESS.H" /* interface for JPEG lossless decompressor */ +#include "JPEGLIB.H" /* interface for JPEG lossy decompressor */ #ifdef MAYO_WAVE #include "Mayo.h" /* interface for wavelet decompressor */ Index: Papyrus3/PapyWrite3.c =================================================================== --- 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 -#include "jpegless.h" /* interface for JPEG lossless decompressor */ -#include "jpeglib.h" /* interface for JPEG lossy decompressor */ +#include "JPEGLESS.H" /* interface for JPEG lossless decompressor */ +#include "JPEGLIB.H" /* interface for JPEG lossy decompressor */ #ifdef MAYO_WAVE Index: Papyrus3/JpegDir/JpgLless/decompoptimise.c =================================================================== --- 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 #include /*#include */ -#include "io.h" -#include "jpeg.h" -#include "mcu.h" -#include "proto.h" +#include "IO.H" +#include "JPEG.H" +#include "MCU.H" +#include "PROTO.H" /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/PROTO.H =================================================================== --- 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 -#include "mcu.h" +#include "MCU.H" #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLless/IO.H =================================================================== --- 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 -#include "jpeg.h" +#include "JPEG.H" /* Index: Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c =================================================================== --- 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 #include #include -#include "jpeg.h" -#include "mcu.h" -#include "io.h" -#include "proto.h" -#include "predict.h" -#include "jpegless.h" +#include "JPEG.H" +#include "MCU.H" +#include "IO.H" +#include "PROTO.H" +#include "PREDICT.H" +#include "JPEGLESS.H" /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLless/huffdoptimise.c =================================================================== --- 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 #include -#include "jpeg.h" -#include "mcu.h" -#include "io.h" -#include "proto.h" -#include "predict.h" +#include "JPEG.H" +#include "MCU.H" +#include "IO.H" +#include "PROTO.H" +#include "PREDICT.H" /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Pointer to routine to downsample a single component */ Index: Papyrus3/JpegDir/JpgLossy/JDPHUFF.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdhuff.h" /* Declarations shared with jdhuff.c */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDHUFF.H" /* Declarations shared with jdhuff.c */ #ifdef D_PROGRESSIVE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDMASTER.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JCHUFF.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jchuff.h" /* Declarations shared with jcphuff.c */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JCHUFF.H" /* Declarations shared with jcphuff.c */ /* Expanded entropy encoder object for Huffman encoding. Index: Papyrus3/JpegDir/JpgLossy/JCCOLOR.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private subobject */ Index: Papyrus3/JpegDir/JpgLossy/JDMARKER.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" typedef enum { /* JPEG marker codes */ Index: Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ /* Private subobject for this module */ Index: Papyrus3/JpegDir/JpgLossy/CDJPEG.H =================================================================== --- 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 */ #define JPEG_INTERNAL_OPTIONS /* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */ -#include "jinclude.h" -#include "jpeglib.h" -#include "jerror.h" /* get library error codes too */ -#include "cderror.h" /* get application-specific error codes */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JERROR.H" /* get library error codes too */ +#include "CDERROR.H" /* get application-specific error codes */ /* Index: Papyrus3/JpegDir/JpgLossy/JCMAINCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* 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:57:01.000000000 +0100 +++ Papyrus3/JpegDir/JpgLossy/JUTILS.C 2013-10-28 16:57:08.000000000 +0100 @@ -12,8 +12,8 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JERROR.C =================================================================== --- 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 @@ */ /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ -#include "jinclude.h" -#include "jpeglib.h" -#include "jversion.h" -#include "jerror.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JVERSION.H" +#include "JERROR.H" #ifdef USE_WINDOWS_MESSAGEBOX #include @@ -48,7 +48,7 @@ #define JMESSAGE(code,string) string , const char * const jpeg_std_message_table[] = { -#include "jerror.h" +#include "JERROR.H" NULL }; Index: Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jmemsys.h" /* import the system-dependent declarations */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JMEMSYS.H" /* import the system-dependent declarations */ /* the PAPYRUS3 memory manager */ /* Papyrus 3 redefined basic types */ Index: Papyrus3/JpegDir/JpgLossy/JDAPISTD.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLossy/JCOMAPI.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JCMASTER.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JINCLUDE.H =================================================================== --- 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. */ -#include "jconfig.h" /* auto configuration options */ +#include "JCONFIG.H" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ /* Index: Papyrus3/JpegDir/JpgLossy/JCPHUFF.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jchuff.h" /* Declarations shared with jchuff.c */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JCHUFF.H" /* Declarations shared with jchuff.c */ #ifdef C_PROGRESSIVE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDMAINCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JCPARAM.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JFDCTINT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_ISLOW_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JCPREPCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* 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:57:01.000000000 +0100 +++ Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C 2013-10-28 16:57:08.000000000 +0100 @@ -16,9 +16,9 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ /* Index: Papyrus3/JpegDir/JpgLossy/jmemmgr.c =================================================================== --- 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 #define AM_MEMORY_MANAGER /* we define jvirt_Xarray_control structs */ -#include "jinclude.h" -#include "jpeglib.h" -#include "jmemsys.h" /* import the system-dependent declarations */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JMEMSYS.H" /* import the system-dependent declarations */ #ifndef NO_GETENV #ifndef HAVE_STDLIB_H /* should declare getenv() */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTFST.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_IFAST_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JIDCTINT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_ISLOW_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDATADST.C =================================================================== --- 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 @@ */ /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ -#include "jinclude.h" -#include "jpeglib.h" -#include "jerror.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JERROR.H" /* Expanded data destination object for stdio output */ Index: Papyrus3/JpegDir/JpgLossy/JDINPUT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private state */ Index: Papyrus3/JpegDir/JpgLossy/JDCOLOR.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private subobject */ Index: Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JFDCTFST.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_IFAST_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Pointer to routine to upsample a single component */ Index: Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Private buffer controller object */ Index: Papyrus3/JpegDir/JpgLossy/JQUANT2.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" #ifdef QUANT_2PASS_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDATASRC.C =================================================================== --- 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 @@ */ /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ -#include "jinclude.h" -#include "jpeglib.h" -#include "jerror.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JERROR.H" /* Expanded data source object for stdio input */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_FLOAT_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JCINIT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C =================================================================== --- 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. */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JCMARKER.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" typedef enum { /* JPEG marker codes */ Index: Papyrus3/JpegDir/JpgLossy/JIDCTRED.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef IDCT_SCALING_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDHUFF.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdhuff.h" /* Declarations shared with jdphuff.c */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDHUFF.H" /* Declarations shared with jdphuff.c */ /* Index: Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* 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:57:01.000000000 +0100 +++ Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C 2013-10-28 16:57:08.000000000 +0100 @@ -35,9 +35,9 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" -#include "jdct.h" /* Private declarations for DCT subsystem */ +#include "JINCLUDE.H" +#include "JPEGLIB.H" +#include "JDCT.H" /* Private declarations for DCT subsystem */ #ifdef DCT_FLOAT_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Block smoothing is only applicable for progressive JPEG, so: */ #ifndef D_PROGRESSIVE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JDMERGE.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" #ifdef UPSAMPLE_MERGING_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/JCAPISTD.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Index: Papyrus3/JpegDir/JpgLossy/JQUANT1.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" #ifdef QUANT_1PASS_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/RDRLE.C =================================================================== --- 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. */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ #ifdef RLE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/RDGIF.C =================================================================== --- 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." */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ #ifdef GIF_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/RDTARGA.C =================================================================== --- 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. */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JDTRANS.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLossy/RDSWITCH.C =================================================================== --- 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 */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/RDBMP.C =================================================================== --- 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. */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/WRRLE.C =================================================================== --- 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. */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ #ifdef RLE_SUPPORTED Index: Papyrus3/JpegDir/JpgLossy/RDPPM.C =================================================================== --- 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). */ -#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ +#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ Index: Papyrus3/JpegDir/JpgLossy/JCTRANS.C =================================================================== --- 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 @@ */ #define JPEG_INTERNALS -#include "jinclude.h" -#include "jpeglib.h" +#include "JINCLUDE.H" +#include "JPEGLIB.H" /* Forward declarations */ Index: Papyrus3/JpegDir/JpgLless/JPEGUTIL.C =================================================================== --- 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 #include /* #include */ -#include "jpeg.h" -#include "mcu.h" -#include "proto.h" +#include "JPEG.H" +#include "MCU.H" +#include "PROTO.H" /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ -#ifndef PapyEalloc3H #include "PapyEalloc3.h" -#endif -#ifndef PapyFileSystem3H #include "PapyFileSystem3.h" -#endif #else /* FILENAME83 defined for the DOS machines */ debian/patches/hardening.patch0000644000000000000000000000221312233505033013567 0ustar Description: Fix issues with gcc hardening compilations flags Author: Mathieu Malaterre Forwarded: no Index: Papyrus3/PapyError3.c =================================================================== --- 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; - fprintf (stderr, sPapyErrorDecoP); + fprintf (stderr, "%s", sPapyErrorDecoP); if (sCrtErrLevel >= 0) { fprintf (stderr, "%s\n", sERRMSG); @@ -202,7 +202,7 @@ else fprintf (stderr, "No e%s\n", &sERRMSG [1]); - fprintf (stderr, sPapyErrorDecoP); + fprintf (stderr, "%s", sPapyErrorDecoP); #endif } /* endof PapyPrintErrMsg3 */ Index: Papyrus3/TESTS/TestRead.c =================================================================== --- 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 #include +#include /* exit */ #include "Papyrus3.h"