[pixeldata] Revert addition of NoPixelData error variant

- InnerError was mistakenly made public
Enet4 · Oct 6, 2023 · 34be166 · 34be166
1 parent c45955d
commit 34be166
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/pixeldata/src/attribute.rs b/pixeldata/src/attribute.rs
@@ -2,7 +2,7 @@
 
 use dicom_core::{DataDictionary, Tag};
 use dicom_dictionary_std::tags;
-use dicom_object::{FileDicomObject, InMemDicomObject};
+use dicom_object::{mem::InMemElement, FileDicomObject, InMemDicomObject};
 use snafu::{ensure, Backtrace, OptionExt, ResultExt, Snafu};
 use std::fmt;
 
@@ -142,6 +142,16 @@ pub fn high_bit<D: DataDictionary + Clone>(
     retrieve_required_u16(obj, tags::HIGH_BIT, AttributeName::HighBit)
 }
 
+/// Get the PixelData element from the DICOM object
+pub fn pixel_data<D: DataDictionary + Clone>(
+    obj: &FileDicomObject<InMemDicomObject<D>>,
+) -> Result<&InMemElement<D>> {
+    let name = AttributeName::PixelData;
+    obj.element_opt(tags::PIXEL_DATA)
+        .context(RetrieveSnafu { name })?
+        .context(MissingRequiredSnafu { name })
+}
+
 /// Get the RescaleIntercept from the DICOM object or returns 0
 pub fn rescale_intercept<D: DataDictionary + Clone>(
     obj: &FileDicomObject<InMemDicomObject<D>>,

diff --git a/pixeldata/src/gdcm.rs b/pixeldata/src/gdcm.rs
@@ -16,9 +16,8 @@ where
 {
     fn decode_pixel_data(&self) -> Result<DecodedPixelData> {
         use super::attribute::*;
-        use dicom_dictionary_std::tags;
 
-        let pixel_data = self.get(tags::PIXEL_DATA).context(NoPixelDataSnafu)?;
+        let pixel_data = pixel_data(self).context(GetAttributeSnafu)?;
 
         let cols = cols(self).context(GetAttributeSnafu)?;
         let rows = rows(self).context(GetAttributeSnafu)?;

diff --git a/pixeldata/src/lib.rs b/pixeldata/src/lib.rs
@@ -151,11 +151,6 @@ pub struct Error(InnerError);
 /// Inner error type
 #[derive(Debug, Snafu)]
 pub enum InnerError {
-    #[snafu(display("Object has no Pixel Data"))]
-    NoPixelData {
-        backtrace: Backtrace,
-    },
-
     #[snafu(display("Failed to get required DICOM attribute"))]
     GetAttribute {
         #[snafu(backtrace)]
@@ -1769,9 +1764,7 @@ where
     D: DataDictionary + Clone,
 {
     fn decode_pixel_data(&self) -> Result<DecodedPixelData> {
-        use dicom_dictionary_std::tags;
-
-        let pixel_data = self.get(tags::PIXEL_DATA).context(NoPixelDataSnafu)?;
+        let pixel_data = attribute::pixel_data(self).context(GetAttributeSnafu)?;
 
         let ImagingProperties {
             cols,
@@ -1871,9 +1864,7 @@ where
     }
 
     fn decode_pixel_data_frame(&self, frame: u32) -> Result<DecodedPixelData<'_>> {
-        use dicom_dictionary_std::tags;
-
-        let pixel_data = self.get(tags::PIXEL_DATA).context(NoPixelDataSnafu)?;
+        let pixel_data = attribute::pixel_data(self).context(GetAttributeSnafu)?;
 
         let ImagingProperties {
             cols,