Author: malat
Date: 2013-10-28 14:07:54 +0000 (Mon, 28 Oct 2013)
New Revision: 15015
Added:
trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch
trunk/packages/papyrus/trunk/debian/patches/hardening.patch
trunk/packages/papyrus/trunk/debian/patches/redo.patch
trunk/packages/papyrus/trunk/debian/patches/ya.patch
Modified:
trunk/packages/papyrus/trunk/debian/patches/series
Log:
Add C++ compat
Added: trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch
(rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch 2013-10-28
14:07:54 UTC (rev 15015)
@@ -0,0 +1,1203 @@
+Description: <short summary of the patch>
+ 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 <ma...@debian.org>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- 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/CMakeLists.txt
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -18,23 +18,33 @@ include_directories(
+ #add_subdirectory(${JPEGDIRLY})
+ #add_subdirectory(${DICOMDIR})
+
++#add_definitions(
++# -DPapyrus3H
++# -DDicomdirH
++# -DDicomdirEnumRecordsH
++# -DDicomdirTypeDef3H
++# -DDicomdirPrivFunctionDef3H
++# -DDicomdirPubFunctionDef3H
++# -DDicomdirGlobalVar3H
++# )
++
+ 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
++ 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
+@@ -63,81 +73,81 @@ if(WIN32)
+ endif()
+
+ list(APPEND SOURCES
+- DicomDir/DicomDirDataSetRead.c
+- DicomDir/DicomDirDataSetWrite.c
+- DicomDir/DicomDirFiles.c
+- DicomDir/DicomDirInit.c
+- DicomDir/DicomDirInitRecords.c
+- DicomDir/OGlobalDicomFunc.cpp
++ DicomDir/DicomDirDataSetRead.c
++ DicomDir/DicomDirDataSetWrite.c
++ DicomDir/DicomDirFiles.c
++ DicomDir/DicomDirInit.c
++ DicomDir/DicomDirInitRecords.c
++ DicomDir/OGlobalDicomFunc.cpp
+ )
+ 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
++ 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
+ )
+
+ 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
++ 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})
+--- papyrus-3.7.1.orig/PapyInitGroups3.c
++++ papyrus-3.7.1/PapyInitGroups3.c
+@@ -63,9 +63,7 @@
+
+ #include <stdio.h>
+
+-#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/JpgLossy/RDRLE.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDRLE.C
+@@ -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
+
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDGIF.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDGIF.C
+@@ -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
+
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDTARGA.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDTARGA.C
+@@ -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 ... */
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDTRANS.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/JDTRANS.C
+@@ -11,8 +11,8 @@
+ */
+
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+
+
+ /* Forward declarations */
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDSWITCH.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDSWITCH.C
+@@ -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 ... */
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDBMP.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDBMP.C
+@@ -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 ... */
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/WRRLE.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/WRRLE.C
+@@ -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
+
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDPPM.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/RDPPM.C
+@@ -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 ... */
+--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCTRANS.C
++++ papyrus-3.7.1/JpegDir/JpgLossy/JCTRANS.C
+@@ -11,8 +11,8 @@
+ */
+
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+
+
+ /* Forward declarations */
+--- 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/CMakeLists.txt
++++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
+@@ -3,7 +3,7 @@ set(SOURCES
+ decompoptimise.c
+ huffcoptimisebug.c
+ huffdoptimise.c
+- #jpegutil.c
++ JPEGUTIL.C
+ MCU.C
+ pmreadoptimise.c
+ pnmtoljpoptimisebug.c
+@@ -12,6 +12,8 @@ set(SOURCES
+ 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)
++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE "C")
++set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE "C")
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/JPEGUTIL.C
++++ papyrus-3.7.1/JpegDir/JpgLless/JPEGUTIL.C
+@@ -37,21 +37,17 @@
+ #include <stdlib.h>
+ #include <string.h>
+ /* #include <malloc.h> */
+-#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 */
+
+--- 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 <stdio.h>
+ #include <string.h>
+
+-#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 <stdio.h>
+
+-#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/CMakeLists.txt
++++ papyrus-3.7.1/DicomDir/CMakeLists.txt
+@@ -12,11 +12,11 @@ set(SOURCES
+ set(HEADERS
+ DicomDir.h
+ DicomDirEnumRecords.h
+- DicomDirGlobalVar3.h
++ DicomdirGlobalVar3.h
+ DicomDirInitRecords.h
+- DicomDirPrivFunctionDef3.h
+- DicomDirPubFunctionDef3.h
+- DicomDirTypeDef3.h
++ DicomdirPrivFunctionDef3.h
++ DicomdirPubFunctionDef3.h
++ DicomdirTypeDef3.h
+ OGlobalDicomFunc.h
+ )
+
+--- papyrus-3.7.1.orig/DicomDir/DicomDirFiles.c
++++ papyrus-3.7.1/DicomDir/DicomDirFiles.c
+@@ -55,9 +55,7 @@
+ #include <string.h>
+ #include <memory.h>
+
+-#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 <stdio.h>
+
+-#ifndef DicomdirH
+ #include "DicomDir.h"
+-#endif
+
+
+
/********************************************************************************/
+--- papyrus-3.7.1.orig/TESTS/CMakeLists.txt
++++ papyrus-3.7.1/TESTS/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ # Tests
+ add_executable(TestRead TestRead.c)
+ target_link_libraries(TestRead Papyrus3)
++#set_source_files_properties(TestRead.c PROPERTIES LANGUAGE CXX)
+
+-add_executable(TestWrite TestWrite.c)
+-target_link_libraries(TestWrite Papyrus3)
++#add_executable(TestWrite TestWrite.c)
++#target_link_libraries(TestWrite Papyrus3)
++#set_source_files_properties(TestWrite.c PROPERTIES LANGUAGE CXX)
Added: trunk/packages/papyrus/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/hardening.patch
(rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/hardening.patch 2013-10-28
14:07:54 UTC (rev 15015)
@@ -0,0 +1,45 @@
+Description: <short summary of the patch>
+ 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 <ma...@debian.org>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- papyrus-3.7.1.orig/PapyError3.c
++++ papyrus-3.7.1/PapyError3.c
+@@ -168,7 +168,7 @@ void PapyPrintErrMsg3 (char *inFileP, Pa
+ #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 @@ void PapyPrintErrMsg3 (char *inFileP, Pa
+ else
+ fprintf (stderr, "No e%s\n", &sERRMSG [1]);
+
+- fprintf (stderr, sPapyErrorDecoP);
++ fprintf (stderr, "%s", sPapyErrorDecoP);
+ #endif
+
+ } /* endof PapyPrintErrMsg3 */
Added: trunk/packages/papyrus/trunk/debian/patches/redo.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/redo.patch
(rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/redo.patch 2013-10-28
14:07:54 UTC (rev 15015)
@@ -0,0 +1,144 @@
+Description: <short summary of the patch>
+ 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 <ma...@debian.org>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- papyrus-3.7.1.orig/CMakeLists.txt
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -14,9 +14,9 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
+-add_subdirectory(${JPEGDIRLL})
+-add_subdirectory(${JPEGDIRLY})
+-add_subdirectory(${DICOMDIR})
++#add_subdirectory(${JPEGDIRLL})
++#add_subdirectory(${JPEGDIRLY})
++#add_subdirectory(${DICOMDIR})
+
+ set(SOURCES
+ PapyVars3.c
+@@ -56,22 +56,94 @@ set(HEADERS
+ PapyWild3.h
+ )
+ if(UNIX)
+- set(SOURCES
+- ${SOURCES}
+- PapyFileSystemUnix3.c PapyEallocUnix3.c
+- )
++ list(APPEND SOURCES PapyFileSystemUnix3.c PapyEallocUnix3.c)
+ endif()
+ if(WIN32)
+- set(SOURCES
+- ${SOURCES}
+- PapyFileSystemPC3.c PapyEallocPC3.c
+- )
++ 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.c
++ )
++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
++ )
++
++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})
+ set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
+ set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C)
+-target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
++#target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
+
+ add_subdirectory(TESTS)
+
Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 14:05:17 UTC
(rev 15014)
+++ trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 14:07:54 UTC
(rev 15015)
@@ -1,3 +1,7 @@
all.patch
more.patch
more2.patch
+hardening.patch
+redo.patch
+ya.patch
+fixcxx.patch
Added: trunk/packages/papyrus/trunk/debian/patches/ya.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/ya.patch
(rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/ya.patch 2013-10-28
14:07:54 UTC (rev 15015)
@@ -0,0 +1,163 @@
+Description: <short summary of the patch>
+ 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 <ma...@debian.org>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- papyrus-3.7.1.orig/CMakeLists.txt
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -68,76 +68,76 @@ list(APPEND SOURCES
+ DicomDir/DicomDirFiles.c
+ DicomDir/DicomDirInit.c
+ DicomDir/DicomDirInitRecords.c
+- DicomDir/OGlobalDicomFunc.c
++ DicomDir/OGlobalDicomFunc.cpp
+ )
+ 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/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
++ JpegDir/JpgLless/PREDICT.C
++ JpegDir/JpgLless/READ.C
++ JpegDir/JpgLless/WRITE.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/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
++ 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})
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
