Skip to content

Commit 75406db

Browse files
committed
Make sure that accessing CompImageHDU.data doesn't change the orig_ attributes
1 parent c84b9e4 commit 75406db

1 file changed

Lines changed: 17 additions & 5 deletions

File tree

‎astropy/io/fits/hdu/compressed/compressed.py‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,20 +540,32 @@ def data(self):
540540
elif len(self._bintable.data) == 0:
541541
return None
542542

543-
if getattr(self, "_decompressed_data", None) is not None:
544-
return self._decompressed_data
543+
# Save the original scale-related values, because when we set
544+
# self.data below these will get overridden in the ImageHDU.data setter
545+
# but we don't want the settings to change just because we accessed
546+
# the data.
547+
orig_values = (
548+
self._orig_bitpix,
549+
self._orig_bscale,
550+
self._orig_bzero,
551+
self._orig_blank,
552+
)
545553

546554
# Since .section has general code to load any arbitrary part of the
547555
# data, we can just use this
548-
data = self._decompressed_data = self.section[...]
556+
self.data = self.section[...]
557+
558+
# Restore the original scale-related values
559+
self._orig_bitpix, self._orig_bscale, self._orig_bzero, self._orig_blank = (
560+
orig_values
561+
)
549562

550-
return data
563+
return self.data
551564

552565
@data.setter
553566
def data(self, data):
554567
self._data_modified = True
555568
self._decompression_active = False
556-
self._decompressed_data = None
557569
ImageHDU.data.fset(self, data)
558570
if (
559571
data is not None

0 commit comments

Comments
 (0)