add getFrameSize

Author: sameeul

src/nyx/dicom_util.h

@@ -0,0 +1,22 @@
+#include "dcmtk/config/osconfig.h"    // For DCMTK_VERSION_NUMBER and config macros
+#include "dcmtk/dcmdata/dctk.h"       // Core DICOM toolkit (includes DcmDataset, DcmPixelData, etc.)
+#include "dcmtk/dcmdata/dcpixel.h"    // For DcmPixelData
+#include "dcmtk/dcmdata/dcdeftag.h"   // For DCM_PixelData tag
+
+Uint32 getFrameSize(DcmDataset* dataset)
+{
+    DcmPixelData* pixelData = nullptr;
+    if (dataset->findAndGetElement(DCM_PixelData, pixelData).bad() || !pixelData)
+        return 0;
+
+    Uint32 frameSize = 0;
+#if DCMTK_VERSION_NUMBER >= 0x036800
+    // DCMTK 3.6.8+ expects a boolean indicating uncompressed state
+    OFBool isUncompressed = (pixelData->transferState() == ERW_memory);
+    status = pixelData->getUncompressedFrameSize(dataset, frameSize, isUncompressed);
+#else
+    // DCMTK 3.6.7 signature without boolean
+    status = pixelData->getUncompressedFrameSize(dataset, frameSize);
+#endif
+    return status.good() ? frameSize : 0;
+}

src/nyx/nyxus_dicom_loader.h

@@ -1,7 +1,7 @@
 #ifdef DICOM_SUPPORT
 #pragma once
 #include "abs_tile_loader.h"
-#include "dcmtk/dcmdata/dctk.h"
+#include "dicom_util.h"
 #include "dcmtk/dcmjpeg/djdecode.h"  /* for JPEG decoders */
 #include "dcmtk/dcmjpls/djdecode.h"  /* for JPEG-LS decoders */
 #include "dcmtk/dcmdata/dcrledrg.h"  /* for RLE decoder */
@@ -232,8 +232,7 @@ class NyxusGrayscaleDicomLoader : public AbstractTileLoader<DataType>
         auto status = ds->findAndGetElement(DCM_PixelData, pixel_data_ptr);
         if(status.good()){
             DcmPixelData* pixel_data = OFreinterpret_cast(DcmPixelData*, pixel_data_ptr);
-            uint32_t frame_size = 0;
-            pixel_data->getUncompressedFrameSize(ds,frame_size);
+            uint32_t frame_size = getFrameSize(ds);
             frame_size % 2 == 0 ? frame_size = frame_size : frame_size = frame_size + 1; // need to be even
 
             auto buffer = std::vector<FileType>(data_length);

src/nyx/raw_dicom.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef DICOM_SUPPORT
-#include "dcmtk/dcmdata/dctk.h"
+#include "dicom_util.h"
 #include "dcmtk/dcmjpeg/djdecode.h"  /* for JPEG decoders */
 #include "dcmtk/dcmjpls/djdecode.h"  /* for JPEG-LS decoders */
 #include "dcmtk/dcmdata/dcrledrg.h"  /* for RLE decoder */
@@ -253,8 +253,7 @@ class RawDicomLoader : public RawFormatLoader
         auto status = ds->findAndGetElement(DCM_PixelData, pixel_data_ptr);
         if (status.good()) {
             DcmPixelData* pixel_data = OFreinterpret_cast(DcmPixelData*, pixel_data_ptr);
-            uint32_t frame_size = 0;
-            pixel_data->getUncompressedFrameSize(ds, frame_size);
+            uint32_t frame_size = getFrameSize(ds);
             frame_size % 2 == 0 ? frame_size = frame_size : frame_size = frame_size + 1; // need to be even
 
             auto buffer = std::vector<FileType>(data_length);