Set a function for minimal rescale slope value

nroduit · Jan 31, 2025 · 2db06e7 · 2db06e7
1 parent fa4aa26
commit 2db06e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/weasis-dicom-tools/src/main/java/org/dcm4che3/img/DicomImageAdapter.java b/weasis-dicom-tools/src/main/java/org/dcm4che3/img/DicomImageAdapter.java
@@ -370,7 +370,8 @@ public LookupTableCV getModalityLookup(WlPresentation wlp, boolean inverseLUTAct
   public boolean isPhotometricInterpretationInverse(PresentationStateLut pr) {
     Optional<String> prLUTShape = pr == null ? Optional.empty() : pr.getPrLutShapeMode();
     PhotometricInterpretation p = desc.getPhotometricInterpretation();
-    return prLUTShape.map("INVERSE"::equals)
+    return prLUTShape
+        .map("INVERSE"::equals)
         .orElseGet(() -> p == PhotometricInterpretation.MONOCHROME1);
   }
 

diff --git a/weasis-dicom-tools/src/main/java/org/dcm4che3/img/DicomImageReader.java b/weasis-dicom-tools/src/main/java/org/dcm4che3/img/DicomImageReader.java
@@ -422,7 +422,7 @@ public PlanarImage getPlanarImage(int frame, DicomImageReadParam param) throws I
     }
 
     OptionalDouble rescaleSlope = desc.getModalityLUT().getRescaleSlope();
-    if (rescaleSlope.isPresent() && rescaleSlope.getAsDouble() < 0.5) {
+    if (rescaleSlope.isPresent() && hasVerySmallOutputValues(rescaleSlope.getAsDouble())) {
       double intercept = desc.getModalityLUT().getRescaleIntercept().orElse(0.0);
       ImageCV dstImg = new ImageCV();
       out.toImageCV().convertTo(dstImg, CvType.CV_32F, rescaleSlope.getAsDouble(), intercept);
@@ -435,6 +435,10 @@ public PlanarImage getPlanarImage(int frame, DicomImageReadParam param) throws I
     return out;
   }
 
+  static boolean hasVerySmallOutputValues(double rescaleSlope) {
+    return rescaleSlope < 0.5;
+  }
+
   public PlanarImage getRawImage(int frame, DicomImageReadParam param) throws IOException {
     if (dis == null) {
       return getRawImageFromBytes(frame, param);

diff --git a/weasis-dicom-tools/src/main/java/org/dcm4che3/img/ImageRendering.java b/weasis-dicom-tools/src/main/java/org/dcm4che3/img/ImageRendering.java
@@ -47,7 +47,8 @@ public static PlanarImage getModalityLutImage(
 
     if (datatype >= CvType.CV_8U && datatype < CvType.CV_32S) {
       OptionalDouble rescaleSlope = adapter.getImageDescriptor().getModalityLUT().getRescaleSlope();
-      if (rescaleSlope.isPresent() && rescaleSlope.getAsDouble() < 0.5) {
+      if (rescaleSlope.isPresent()
+          && DicomImageReader.hasVerySmallOutputValues(rescaleSlope.getAsDouble())) {
         double intercept =
             adapter.getImageDescriptor().getModalityLUT().getRescaleIntercept().orElse(0.0);
         ImageCV dstImg = new ImageCV();