changeset 1108:477203923f26 broker

integration mainline->broker
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Oct 2019 10:23:12 +0100
parents 1533cccb5c43 (current diff) c7388dfcd555 (diff)
children 79b1b541fe15
files Framework/Loaders/LoaderCache.cpp
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 30 10:21:51 2019 +0100
+++ b/.hgtags	Wed Oct 30 10:23:12 2019 +0100
@@ -36,3 +36,4 @@
 369050c846a9ca57efdfd15cffb7c240a3ac7417 toa2019102101
 5a18e6a395bc3fcc2915bb169f145027da0702a5 toa2019102301
 df76d308303107cdd327790d3a92b58fa4500f76 toa2019102302
+640feb146fa8186ac4e5ecb87d18b267750ccec3 toa2019102801
--- a/Framework/Scene2D/LookupTableTextureSceneLayer.cpp	Wed Oct 30 10:21:51 2019 +0100
+++ b/Framework/Scene2D/LookupTableTextureSceneLayer.cpp	Wed Oct 30 10:23:12 2019 +0100
@@ -131,7 +131,6 @@
       IncrementRevision();
     }
   }
-    
 
   void LookupTableTextureSceneLayer::FitRange()
   {
--- a/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp	Wed Oct 30 10:21:51 2019 +0100
+++ b/Framework/Volumes/DicomVolumeImageMPRSlicer.cpp	Wed Oct 30 10:23:12 2019 +0100
@@ -45,7 +45,8 @@
     revision_(volume_.GetRevision())
   {
     valid_ = (volume_.HasDicomParameters() &&
-              volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, cuttingPlane));
+              volume_.GetGeometry().DetectSlice(projection_, sliceIndex_, 
+                                                cuttingPlane));
   }
 
 
@@ -75,7 +76,7 @@
     }
 
     std::auto_ptr<TextureBaseSceneLayer> texture;
-        
+      
     {
       const DicomInstanceParameters& parameters = volume_.GetDicomParameters();
       ImageBuffer3D::SliceReader reader(volume_.GetPixelData(), projection_, sliceIndex_);
--- a/Framework/Volumes/ImageBuffer3D.cpp	Wed Oct 30 10:21:51 2019 +0100
+++ b/Framework/Volumes/ImageBuffer3D.cpp	Wed Oct 30 10:23:12 2019 +0100
@@ -118,7 +118,7 @@
     computeRange_(computeRange),
     hasRange_(false)
   {
-    LOG(INFO) << "Created a 3D image of size " << width << "x" << height
+    LOG(TRACE) << "Created a 3D image of size " << width << "x" << height
               << "x" << depth << " in " << Orthanc::EnumerationToString(format)
               << " (" << (GetEstimatedMemorySize() / (1024ll * 1024ll)) << "MB)";
   }