Mercurial > mxe-octave

comparison src/of-dicom-2-gdcm2.4.patch @ 4036:e5c0805d9f5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gdcm: update to 2.4.6, patch of-dicom to work with 2.4.X * src/gdcm.mk: update version ,checksum * src/of-dicom-2-gdcm2.4.patch: new file * dist-files.mk: add of-dicom-2-gdcm2.4.patch
author John D
date Sun, 27 Sep 2015 15:44:30 -0400
parents
children
comparison
equal deleted inserted replaced
4035:66cb6f6de8f7 4036:e5c0805d9f5f
1 diff -ur dicom.orig/src/dicomdict.cpp dicom/src/dicomdict.cpp
2 --- dicom.orig/src/dicomdict.cpp 2015-09-27 15:34:20.971531487 -0400
3 +++ dicom/src/dicomdict.cpp 2015-09-27 15:36:52.571537114 -0400
4 @@ -27,9 +27,9 @@
5 #include "octave/oct.h"
6 #include "octave/load-path.h"
7
8 -#include "gdcm-2.0/gdcmDict.h"
9 -#include "gdcm-2.0/gdcmVR.h"
10 -#include "gdcm-2.0/gdcmVM.h"
11 +#include "gdcm-2.4/gdcmDict.h"
12 +#include "gdcm-2.4/gdcmVR.h"
13 +#include "gdcm-2.4/gdcmVM.h"
14
15 #include "dicomdict.h"
16
17 diff -ur dicom.orig/src/dicominfo.cpp dicom/src/dicominfo.cpp
18 --- dicom.orig/src/dicominfo.cpp 2015-09-27 15:34:20.971531487 -0400
19 +++ dicom/src/dicominfo.cpp 2015-09-27 15:37:31.131538545 -0400
20 @@ -41,18 +41,18 @@
21 #include "octave/oct.h"
22 #include "octave/ov-struct.h"
23
24 -//#include "gdcm-2.0/gdcmSystem.h"
25 -#include "gdcm-2.0/gdcmReader.h"
26 -//#include "gdcm-2.0/gdcmWriter.h"
27 -//#include "gdcm-2.0/gdcmAttribute.h"
28 -#include "gdcm-2.0/gdcmDataSet.h"
29 -//#include "gdcm-2.0/gdcmGlobal.h"
30 -//#include "gdcm-2.0/gdcmDicts.h"
31 -#include "gdcm-2.0/gdcmDict.h"
32 -//#include "gdcm-2.0/gdcmCSAHeader.h"
33 -//#include "gdcm-2.0/gdcmPrivateTag.h"
34 -#include "gdcm-2.0/gdcmVR.h"
35 -#include "gdcm-2.0/gdcmSequenceOfItems.h"
36 +//#include "gdcm-2.4/gdcmSystem.h"
37 +#include "gdcm-2.4/gdcmReader.h"
38 +//#include "gdcm-2.4/gdcmWriter.h"
39 +//#include "gdcm-2.4/gdcmAttribute.h"
40 +#include "gdcm-2.4/gdcmDataSet.h"
41 +//#include "gdcm-2.4/gdcmGlobal.h"
42 +//#include "gdcm-2.4/gdcmDicts.h"
43 +#include "gdcm-2.4/gdcmDict.h"
44 +//#include "gdcm-2.4/gdcmCSAHeader.h"
45 +//#include "gdcm-2.4/gdcmPrivateTag.h"
46 +#include "gdcm-2.4/gdcmVR.h"
47 +#include "gdcm-2.4/gdcmSequenceOfItems.h"
48
49 #include "dicomdict.h"
50
51 diff -ur dicom.orig/src/dicomlookup.cpp dicom/src/dicomlookup.cpp
52 --- dicom.orig/src/dicomlookup.cpp 2015-09-27 15:34:20.971531487 -0400
53 +++ dicom/src/dicomlookup.cpp 2015-09-27 15:37:07.223537658 -0400
54 @@ -20,9 +20,9 @@
55
56 #include "octave/oct.h"
57
58 -#include "gdcm-2.0/gdcmDict.h"
59 -#include "gdcm-2.0/gdcmVR.h"
60 -#include "gdcm-2.0/gdcmVM.h"
61 +#include "gdcm-2.4/gdcmDict.h"
62 +#include "gdcm-2.4/gdcmVR.h"
63 +#include "gdcm-2.4/gdcmVM.h"
64
65 #include "dicomdict.h"
66
67 diff -ur dicom.orig/src/dicomread.cpp dicom/src/dicomread.cpp
68 --- dicom.orig/src/dicomread.cpp 2015-09-27 15:34:20.971531487 -0400
69 +++ dicom/src/dicomread.cpp 2015-09-27 15:37:53.435539373 -0400
70 @@ -24,7 +24,7 @@
71
72 #include "octave/oct.h"
73 #include <octave/ov-struct.h>
74 -#include "gdcm-2.0/gdcmImageReader.h"
75 +#include "gdcm-2.4/gdcmImageReader.h"
76
77 #define DICOM_ERR -1
78 #define DICOM_OK 0
79 diff -ur dicom.orig/src/dicomwrite.cpp dicom/src/dicomwrite.cpp
80 --- dicom.orig/src/dicomwrite.cpp 2015-09-27 15:34:20.971531487 -0400
81 +++ dicom/src/dicomwrite.cpp 2015-09-27 15:38:05.403539817 -0400
82 @@ -21,11 +21,11 @@
83 #include "octave/oct.h"
84 #include "octave/ov-struct.h"
85
86 -#include "gdcm-2.0/gdcmDictEntry.h"
87 -#include "gdcm-2.0/gdcmImage.h"
88 -#include "gdcm-2.0/gdcmImageWriter.h"
89 -#include "gdcm-2.0/gdcmFileDerivation.h"
90 -#include "gdcm-2.0/gdcmUIDGenerator.h"
91 +#include "gdcm-2.4/gdcmDictEntry.h"
92 +#include "gdcm-2.4/gdcmImage.h"
93 +#include "gdcm-2.4/gdcmImageWriter.h"
94 +#include "gdcm-2.4/gdcmFileDerivation.h"
95 +#include "gdcm-2.4/gdcmUIDGenerator.h"
96
97 #include "dicomdict.h"
98
99 diff -ur dicom.orig/src/_gendicomdict.cpp dicom/src/_gendicomdict.cpp
100 --- dicom.orig/src/_gendicomdict.cpp 2015-09-27 15:34:20.971531487 -0400
101 +++ dicom/src/_gendicomdict.cpp 2015-09-27 15:38:22.687540459 -0400
102 @@ -28,17 +28,17 @@
103
104 #include "octave/oct.h"
105
106 -#include "gdcm-2.0/gdcmSystem.h"
107 -#include "gdcm-2.0/gdcmReader.h"
108 -#include "gdcm-2.0/gdcmWriter.h"
109 -#include "gdcm-2.0/gdcmAttribute.h"
110 -#include "gdcm-2.0/gdcmDataSet.h"
111 -#include "gdcm-2.0/gdcmGlobal.h"
112 -#include "gdcm-2.0/gdcmDicts.h"
113 -#include "gdcm-2.0/gdcmDict.h"
114 -#include "gdcm-2.0/gdcmCSAHeader.h"
115 -#include "gdcm-2.0/gdcmPrivateTag.h"
116 -#include "gdcm-2.0/gdcmVR.h"
117 +#include "gdcm-2.4/gdcmSystem.h"
118 +#include "gdcm-2.4/gdcmReader.h"
119 +#include "gdcm-2.4/gdcmWriter.h"
120 +#include "gdcm-2.4/gdcmAttribute.h"
121 +#include "gdcm-2.4/gdcmDataSet.h"
122 +#include "gdcm-2.4/gdcmGlobal.h"
123 +#include "gdcm-2.4/gdcmDicts.h"
124 +#include "gdcm-2.4/gdcmDict.h"
125 +#include "gdcm-2.4/gdcmCSAHeader.h"
126 +#include "gdcm-2.4/gdcmPrivateTag.h"
127 +#include "gdcm-2.4/gdcmVR.h"
128
129 #define OCT_FN_NAME _gendicomdict
130 #define QUOTED_(x) #x