# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1348141674 -7200
# Node ID 297bad4e10196078bcd275d1e5f583c44c0c41a5
# Parent  10bf2cd24d1d4a206836021352142c113fab91f5
refactoring

diff -r 10bf2cd24d1d -r 297bad4e1019 CMakeLists.txt
--- a/CMakeLists.txt	Thu Sep 20 13:41:55 2012 +0200
+++ b/CMakeLists.txt	Thu Sep 20 13:47:54 2012 +0200
@@ -137,6 +137,7 @@
   Core/DicomFormat/DicomArray.cpp
   Core/DicomFormat/DicomMap.cpp
   Core/DicomFormat/DicomTag.cpp
+  Core/DicomFormat/DicomIntegerPixelAccessor.cpp
   Core/FileStorage.cpp
   Core/HttpServer/EmbeddedResourceHttpHandler.cpp
   Core/HttpServer/FilesystemHttpHandler.cpp
@@ -159,7 +160,6 @@
   )  
 
 add_library(ServerLibrary
-  OrthancServer/DicomIntegerPixelAccessor.cpp
   OrthancServer/DicomProtocol/DicomFindAnswers.cpp
   OrthancServer/DicomProtocol/DicomServer.cpp
   OrthancServer/DicomProtocol/DicomUserConnection.cpp
@@ -172,8 +172,6 @@
   OrthancServer/OrthancRestApi.cpp
   OrthancServer/ServerIndex.cpp
   OrthancServer/ToDcmtkBridge.cpp
-  OrthancServer/ToDcmtkBridge.cpp
-  OrthancServer/DicomIntegerPixelAccessor.cpp
   )
 
 # Ensure autogenerated code is built before building ServerLibrary
diff -r 10bf2cd24d1d -r 297bad4e1019 Core/DicomFormat/DicomIntegerPixelAccessor.cpp
--- a/Core/DicomFormat/DicomIntegerPixelAccessor.cpp	Thu Sep 20 13:41:55 2012 +0200
+++ b/Core/DicomFormat/DicomIntegerPixelAccessor.cpp	Thu Sep 20 13:47:54 2012 +0200
@@ -24,7 +24,7 @@
 #define NOMINMAX
 #endif
 
-#include "../Core/OrthancException.h"
+#include "../OrthancException.h"
 #include <boost/lexical_cast.hpp>
 #include <limits>
 
diff -r 10bf2cd24d1d -r 297bad4e1019 Core/DicomFormat/DicomIntegerPixelAccessor.h
--- a/Core/DicomFormat/DicomIntegerPixelAccessor.h	Thu Sep 20 13:41:55 2012 +0200
+++ b/Core/DicomFormat/DicomIntegerPixelAccessor.h	Thu Sep 20 13:47:54 2012 +0200
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "../Core/DicomFormat/DicomMap.h"
+#include "DicomMap.h"
 
 #include <stdint.h>
 
diff -r 10bf2cd24d1d -r 297bad4e1019 OrthancServer/FromDcmtkBridge.cpp
--- a/OrthancServer/FromDcmtkBridge.cpp	Thu Sep 20 13:41:55 2012 +0200
+++ b/OrthancServer/FromDcmtkBridge.cpp	Thu Sep 20 13:47:54 2012 +0200
@@ -24,11 +24,11 @@
 #include "FromDcmtkBridge.h"
 
 #include "ToDcmtkBridge.h"
-#include "DicomIntegerPixelAccessor.h"
 #include "../Core/OrthancException.h"
 #include "../Core/PngWriter.h"
 #include "../Core/DicomFormat/DicomString.h"
 #include "../Core/DicomFormat/DicomNullValue.h"
+#include "../Core/DicomFormat/DicomIntegerPixelAccessor.h"
 
 #include <limits>