Skip to content

Commit edaa5e9

Browse files
committed
Regression: fix suitable for 3D
1 parent 78ae321 commit edaa5e9

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/DicomSeries.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,10 @@ public DicomSpecialElement getFirstSpecialElement() {
301301
@Override
302302
public boolean isSuitableFor3d() {
303303
int size = size(null);
304-
if (size < 1) {
305-
SeriesInstanceList seriesInstanceList =
306-
(SeriesInstanceList) getTagValue(TagW.WadoInstanceReferenceList);
307-
if (seriesInstanceList != null) {
308-
size = seriesInstanceList.size();
309-
}
304+
SeriesInstanceList seriesInstanceList =
305+
(SeriesInstanceList) getTagValue(TagW.WadoInstanceReferenceList);
306+
if (seriesInstanceList != null) {
307+
size = Math.max(size, seriesInstanceList.size());
310308
}
311309
return size >= DefaultView2d.MINIMAL_IMAGES_FOR_3D;
312310
}

weasis-launcher/src/main/java/org/weasis/launcher/PlatformCertificateLoader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ public static void main(String[] args) throws Exception {
3535
public static KeyStore setupDefaultSSLContext() throws Exception {
3636
// Load platform-specific trust store
3737
KeyStore platformTrustStore = loadPlatformTrustStore();
38-
39-
// Load Java default trust store
4038
KeyStore javaTrustStore = loadJavaDefaultTrustStore();
41-
42-
// Merge trust stores
4339
KeyStore mergedTrustStore = mergeTrustStores(platformTrustStore, javaTrustStore);
4440

4541
// Create and set SSL context

0 commit comments

Comments
 (0)