From bddd6a0a01185b632ee47707ab917259449d7259 Mon Sep 17 00:00:00 2001
From: Mario Ceresa <mario.ceresa@alma3d.com>
Date: Mon, 13 May 2013 17:53:47 +0200
Subject: [PATCH 1/2] Changed gdcm include location
Signed-off-by: Mario Ceresa <mario.ceresa@alma3d.com>
---
src/_gendicomdict.cpp | 22 +++++++++++-----------
src/dicomdict.cpp | 6 +++---
src/dicominfo.cpp | 10 +++++-----
src/dicomlookup.cpp | 6 +++---
src/dicomread.cpp | 2 +-
src/dicomwrite.cpp | 10 +++++-----
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/_gendicomdict.cpp b/src/_gendicomdict.cpp
index b0befc3..a98ee09 100644
--- a/src/_gendicomdict.cpp
+++ b/src/_gendicomdict.cpp
@@ -28,17 +28,17 @@
#include "octave/oct.h"
-#include "gdcm-2.0/gdcmSystem.h"
-#include "gdcm-2.0/gdcmReader.h"
-#include "gdcm-2.0/gdcmWriter.h"
-#include "gdcm-2.0/gdcmAttribute.h"
-#include "gdcm-2.0/gdcmDataSet.h"
-#include "gdcm-2.0/gdcmGlobal.h"
-#include "gdcm-2.0/gdcmDicts.h"
-#include "gdcm-2.0/gdcmDict.h"
-#include "gdcm-2.0/gdcmCSAHeader.h"
-#include "gdcm-2.0/gdcmPrivateTag.h"
-#include "gdcm-2.0/gdcmVR.h"
+#include "gdcm/gdcmSystem.h"
+#include "gdcm/gdcmReader.h"
+#include "gdcm/gdcmWriter.h"
+#include "gdcm/gdcmAttribute.h"
+#include "gdcm/gdcmDataSet.h"
+#include "gdcm/gdcmGlobal.h"
+#include "gdcm/gdcmDicts.h"
+#include "gdcm/gdcmDict.h"
+#include "gdcm/gdcmCSAHeader.h"
+#include "gdcm/gdcmPrivateTag.h"
+#include "gdcm/gdcmVR.h"
#define OCT_FN_NAME _gendicomdict
#define QUOTED_(x) #x
diff --git a/src/dicomdict.cpp b/src/dicomdict.cpp
index 31b7738..f19dd3b 100644
--- a/src/dicomdict.cpp
+++ b/src/dicomdict.cpp
@@ -27,9 +27,9 @@
#include "octave/oct.h"
#include "octave/load-path.h"
-#include "gdcm-2.0/gdcmDict.h"
-#include "gdcm-2.0/gdcmVR.h"
-#include "gdcm-2.0/gdcmVM.h"
+#include "gdcm/gdcmDict.h"
+#include "gdcm/gdcmVR.h"
+#include "gdcm/gdcmVM.h"
#include "dicomdict.h"
diff --git a/src/dicominfo.cpp b/src/dicominfo.cpp
index 5766abe..5738af7 100644
--- a/src/dicominfo.cpp
+++ b/src/dicominfo.cpp
@@ -42,17 +42,17 @@
#include "octave/ov-struct.h"
//#include "gdcm-2.0/gdcmSystem.h"
-#include "gdcm-2.0/gdcmReader.h"
+#include "gdcm/gdcmReader.h"
//#include "gdcm-2.0/gdcmWriter.h"
//#include "gdcm-2.0/gdcmAttribute.h"
-#include "gdcm-2.0/gdcmDataSet.h"
+#include "gdcm/gdcmDataSet.h"
//#include "gdcm-2.0/gdcmGlobal.h"
//#include "gdcm-2.0/gdcmDicts.h"
-#include "gdcm-2.0/gdcmDict.h"
+#include "gdcm/gdcmDict.h"
//#include "gdcm-2.0/gdcmCSAHeader.h"
//#include "gdcm-2.0/gdcmPrivateTag.h"
-#include "gdcm-2.0/gdcmVR.h"
-#include "gdcm-2.0/gdcmSequenceOfItems.h"
+#include "gdcm/gdcmVR.h"
+#include "gdcm/gdcmSequenceOfItems.h"
#include "dicomdict.h"
diff --git a/src/dicomlookup.cpp b/src/dicomlookup.cpp
index b3d3b46..bb1ae7f 100644
--- a/src/dicomlookup.cpp
+++ b/src/dicomlookup.cpp
@@ -20,9 +20,9 @@
#include "octave/oct.h"
-#include "gdcm-2.0/gdcmDict.h"
-#include "gdcm-2.0/gdcmVR.h"
-#include "gdcm-2.0/gdcmVM.h"
+#include "gdcm/gdcmDict.h"
+#include "gdcm/gdcmVR.h"
+#include "gdcm/gdcmVM.h"
#include "dicomdict.h"
diff --git a/src/dicomread.cpp b/src/dicomread.cpp
index 1b95f00..44a6a43 100644
--- a/src/dicomread.cpp
+++ b/src/dicomread.cpp
@@ -24,7 +24,7 @@
#include "octave/oct.h"
#include <octave/ov-struct.h>
-#include "gdcm-2.0/gdcmImageReader.h"
+#include "gdcm/gdcmImageReader.h"
#define DICOM_ERR -1
#define DICOM_OK 0
diff --git a/src/dicomwrite.cpp b/src/dicomwrite.cpp
index 7303c92..291920c 100644
--- a/src/dicomwrite.cpp
+++ b/src/dicomwrite.cpp
@@ -21,11 +21,11 @@
#include "octave/oct.h"
#include "octave/ov-struct.h"
-#include "gdcm-2.0/gdcmDictEntry.h"
-#include "gdcm-2.0/gdcmImage.h"
-#include "gdcm-2.0/gdcmImageWriter.h"
-#include "gdcm-2.0/gdcmFileDerivation.h"
-#include "gdcm-2.0/gdcmUIDGenerator.h"
+#include "gdcm/gdcmDictEntry.h"
+#include "gdcm/gdcmImage.h"
+#include "gdcm/gdcmImageWriter.h"
+#include "gdcm/gdcmFileDerivation.h"
+#include "gdcm/gdcmUIDGenerator.h"
#include "dicomdict.h"
--
1.8.1.4