Mercurial > hg > orthanc

changeset 79:297bad4e1019

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Sep 2012 13:47:54 +0200
parents 10bf2cd24d1d
children 6212bf978584
files CMakeLists.txt Core/DicomFormat/DicomIntegerPixelAccessor.cpp Core/DicomFormat/DicomIntegerPixelAccessor.h OrthancServer/FromDcmtkBridge.cpp
diffstat 4 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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>
 
--- 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>
 
--- 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>