rpm/python-pydicom
SHA256
1
0
Fork 0
forked from pool/python-pydicom
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory rpm:devel pool:factory pool:devel
...
pull from: pool:factory
Branches Tags
pool:factory pool:devel rpm:factory rpm:devel

3 Commits
factory ... factory

Author SHA256 Message Date
Ana Guerrero
5334fc5429 Accepting request 1270154 from devel:languages:python 
- Drop BuildRequires on gdcm to skip tests.

- version 3.0.1
  * patch removed: pydicom-pr1908-fixpillow.patch
  * patch removed: pydicom-pr2076-np2.patch
  * some tests disabled
  * changes in 3.0.1:
    * Changed logging of missing plugin imports to use :attr:`logging.DEBUG` (:issue:`2128`).
    * Include all :mod:`~pydicom.examples` module datasets with the package (:issue:`2128`, :issue:`2131`)
    * Fixed an invalid VR value in the private data dictionary (:issue:`2132`).
    * Fixed checking for *Bits Stored* when converting *Float Pixel Data* and *Double Float
      Pixel Data* using the :mod:`~pydicom.pixels` backend (:issue:`2135`).
    * Fixed decoding of pixel data for images with *Bits Allocated* of 1 when frame boundaries are not aligned with byte boundaries (:issue:`2134`).
  * changes in 3.0: seer release_notes/v3.0.0.rst

OBS-URL: https://build.opensuse.org/request/show/1270154
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pydicom?expand=0&rev=17
 2025-04-17 14:09:28 +00:00
Steve Kowalik
22aeb9e5dc - Drop BuildRequires on gdcm to skip tests. 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydicom?expand=0&rev=35
 2025-04-17 05:23:45 +00:00
Markéta Machová
688267a168 Accepting request 1255425 from home:DocB:branches:devel:languages:python 
- version 3.0.1
  * patch removed: pydicom-pr1908-fixpillow.patch
  * patch removed: pydicom-pr2076-np2.patch
  * some tests disabled
  * changes in 3.0.1:
    * Changed logging of missing plugin imports to use :attr:`logging.DEBUG` (:issue:`2128`).
    * Include all :mod:`~pydicom.examples` module datasets with the package (:issue:`2128`, :issue:`2131`)
    * Fixed an invalid VR value in the private data dictionary (:issue:`2132`).
    * Fixed checking for *Bits Stored* when converting *Float Pixel Data* and *Double Float
      Pixel Data* using the :mod:`~pydicom.pixels` backend (:issue:`2135`).
    * Fixed decoding of pixel data for images with *Bits Allocated* of 1 when frame boundaries are not aligned with byte boundaries (:issue:`2134`).
  * changes in 3.0: seer release_notes/v3.0.0.rst

OBS-URL: https://build.opensuse.org/request/show/1255425
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydicom?expand=0&rev=34
 2025-03-24 09:08:15 +00:00
6 changed files with 32 additions and 137 deletions
Expand all files Collapse all files

3
pydicom-2.4.4-gh.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42c06ed74331174111dd42c89db774a13fc472abe18015f22c5aba80cddb7843
size 2203904

3
pydicom-3.0.1-gh.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:848ae8e36f34750cf837e48ca5cdf6f7a472145724946d5f28f529279fe11f4e
size 2899710

23
pydicom-pr1908-fixpillow.patch
View File

@@ -1,23 +0,0 @@
From 11f7bd260137a18496bdfd00ddb742ef0cf2d2fd Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Mon, 16 Oct 2023 10:35:46 +1100
Subject: [PATCH 1/4] Fix Pillow raising AttributeError due to Image.mode being
read-only
Index: pydicom-2.4.4/pydicom/pixel_data_handlers/pillow_handler.py
===================================================================
--- pydicom-2.4.4.orig/pydicom/pixel_data_handlers/pillow_handler.py
+++ pydicom-2.4.4/pydicom/pixel_data_handlers/pillow_handler.py
@@ -129,7 +129,11 @@ def _decompress_single_frame(
image.tile[0][2],
(color_mode, ''),
)]
- image.mode = color_mode
+ # Pillow 10.1+ made Image.mode read-only
+ if hasattr(image, "_mode"):
+ image._mode = color_mode
+ else:
+ image.mode = color_mode
image.rawmode = color_mode
return image

101
pydicom-pr2076-np2.patch
View File

@@ -1,101 +0,0 @@
Index: pydicom-2.4.4/pydicom/pixel_data_handlers/pillow_handler.py
===================================================================
--- pydicom-2.4.4.orig/pydicom/pixel_data_handlers/pillow_handler.py
+++ pydicom-2.4.4/pydicom/pixel_data_handlers/pillow_handler.py
@@ -255,14 +255,14 @@ def get_pixeldata(ds: "Dataset") -> "num
if ds.PixelRepresentation == 1:
# Pillow converts signed data to unsigned
# so we need to undo this conversion
- arr -= 2**(bits_allocated - 1)
+ arr -= numpy.uint32(2**(bits_allocated - 1))
if shift:
arr = numpy.right_shift(arr, shift)
else:
# Corrections based on dataset elements
if ds.PixelRepresentation == 1:
- arr -= 2**(bits_allocated - 1)
+ arr -= numpy.uint32(2**(bits_allocated - 1))
if shift:
arr = numpy.right_shift(arr, shift)
Index: pydicom-2.4.4/pydicom/pixel_data_handlers/pylibjpeg_handler.py
===================================================================
--- pydicom-2.4.4.orig/pydicom/pixel_data_handlers/pylibjpeg_handler.py
+++ pydicom-2.4.4/pydicom/pixel_data_handlers/pylibjpeg_handler.py
@@ -66,11 +66,7 @@ except ImportError:
HAVE_PYLIBJPEG = False
if HAVE_PYLIBJPEG:
- try:
- from pylibjpeg.utils import get_pixel_data_decoders
- except ImportError:
- # Old import, deprecated in 1.2, removal in 2.0
- from pylibjpeg.pydicom.utils import get_pixel_data_decoders
+ from pylibjpeg.utils import get_pixel_data_decoders, Decoder
try:
import openjpeg
@@ -249,7 +245,7 @@ def generate_frames(
"elements are missing from the dataset: " + ", ".join(missing)
)
- decoder = _DECODERS[tsyntax]
+ decoder = cast(Decoder, _DECODERS[tsyntax])
LOGGER.debug(f"Decoding {tsyntax.name} encoded Pixel Data using {decoder}")
nr_frames = getattr(ds, "NumberOfFrames", 1)
@@ -260,7 +256,7 @@ def generate_frames(
bits_allocated = cast(int, ds.BitsAllocated)
for frame in generate_pixel_data_frame(ds.PixelData, nr_frames):
- arr = decoder(frame, pixel_module)
+ arr = decoder(frame, ds=pixel_module)
if (
tsyntax in [JPEG2000, JPEG2000Lossless]
Index: pydicom-2.4.4/pydicom/tests/test_encoders_pydicom.py
===================================================================
--- pydicom-2.4.4.orig/pydicom/tests/test_encoders_pydicom.py
+++ pydicom-2.4.4/pydicom/tests/test_encoders_pydicom.py
@@ -444,7 +444,7 @@ class TestRLEEncodeFrame:
assert ds.SamplesPerPixel == 3
assert ds.PixelRepresentation == 0
- arr = ref.newbyteorder('>')
+ arr = ref.view(ref.dtype.newbyteorder('>'))
assert id(arr) != id(ref)
assert arr.dtype == '>u2'
encoded = rle_encode_frame(arr)
Index: pydicom-2.4.4/pydicom/pixel_data_handlers/util.py
===================================================================
--- pydicom-2.4.4.orig/pydicom/pixel_data_handlers/util.py
+++ pydicom-2.4.4/pydicom/pixel_data_handlers/util.py
@@ -200,7 +200,7 @@ def apply_color_lut(
# IVs >= `first_map` are mapped by the Palette Color LUTs
# `first_map` may be negative, positive or 0
mapped_pixels = arr >= first_map
- clipped_iv[mapped_pixels] = arr[mapped_pixels] - first_map
+ clipped_iv[mapped_pixels] = arr[mapped_pixels] - np.int32(first_map)
# IVs > number of entries get set to last entry
np.clip(clipped_iv, 0, nr_entries - 1, out=clipped_iv)
@@ -276,7 +276,7 @@ def apply_modality_lut(arr: "np.ndarray"
# IVs >= `first_map` are mapped by the Modality LUT
# `first_map` may be negative, positive or 0
mapped_pixels = arr >= first_map
- clipped_iv[mapped_pixels] = arr[mapped_pixels] - first_map
+ clipped_iv[mapped_pixels] = arr[mapped_pixels] - np.int32(first_map)
# IVs > number of entries get set to last entry
np.clip(clipped_iv, 0, nr_entries - 1, out=clipped_iv)
@@ -458,7 +458,7 @@ def apply_voi(
# IVs >= `first_map` are mapped by the VOI LUT
# `first_map` may be negative, positive or 0
mapped_pixels = arr >= first_map
- clipped_iv[mapped_pixels] = arr[mapped_pixels] - first_map
+ clipped_iv[mapped_pixels] = arr[mapped_pixels] - np.int32(first_map)
# IVs > number of entries get set to last entry
np.clip(clipped_iv, 0, nr_entries - 1, out=clipped_iv)

21
python-pydicom.changes
View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Thu Apr 17 05:22:46 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Drop BuildRequires on gdcm to skip tests.
-------------------------------------------------------------------
Sun Mar 23 17:15:52 UTC 2025 - Axel Braun <axel.braun@gmx.de>
- version 3.0.1
* patch removed: pydicom-pr1908-fixpillow.patch
* patch removed: pydicom-pr2076-np2.patch
* some tests disabled
* changes in 3.0.1:
* Changed logging of missing plugin imports to use :attr:`logging.DEBUG` (:issue:`2128`).
* Include all :mod:`~pydicom.examples` module datasets with the package (:issue:`2128`, :issue:`2131`)
* Fixed an invalid VR value in the private data dictionary (:issue:`2132`).
* Fixed checking for *Bits Stored* when converting *Float Pixel Data* and *Double Float
Pixel Data* using the :mod:`~pydicom.pixels` backend (:issue:`2135`).
* Fixed decoding of pixel data for images with *Bits Allocated* of 1 when frame boundaries are not aligned with byte boundaries (:issue:`2134`).
* changes in 3.0: seer release_notes/v3.0.0.rst
-------------------------------------------------------------------
Wed Sep 4 07:18:47 UTC 2024 - Ben Greiner <code@bnavigator.de>

18
python-pydicom.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pydicom
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,13 @@
%{?sle15_python_module_pythons}
Name: python-pydicom
Version: 2.4.4
Version: 3.0.1
Release: 0
Summary: Pure python package for DICOM medical file reading and writing
License: MIT
URL: https://github.com/darcymason/pydicom
Source: https://github.com/pydicom/pydicom/archive/refs/tags/v%{version}.tar.gz#/pydicom-%{version}-gh.tar.gz
# PATCH-FIX-UPSTREAM pydicom-pr1908-fixpillow.patch gh#pydicom/pydicom#1908 fixes gh#pydicom/pydicom#1907
Patch0: pydicom-pr1908-fixpillow.patch
# PATCH-FIX-UPSTREAM pydicom-pr2076-np2.patch gh#pydicom/pydicom#2076
Patch1: pydicom-pr2076-np2.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module flit-core >= 3.2}
BuildRequires: %{python_module pip}
@@ -39,10 +36,6 @@ BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module pydicom-data}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests}
%if 0%{?suse_version} > 1550
# GDCM is not multiflavor in Tumbleweed
BuildRequires: python3-gdcm
%endif
# /SECTION
BuildArch: noarch
Requires(post): update-alternatives
@@ -85,6 +78,11 @@ skips="$skips or test_get_testdata_files_hash_match"
skips="$skips or test_get_testdata_files_hash_mismatch"
skips="$skips or test_get_testdata_files_external_ignore_hash"
skips="$skips or test_decoder_base"
skips="$skips or test_decoder_native"
skips="$skips or test_utils"
skips="$skips or test_dataset"
if [ "$RPM_ARCH" = "ppc64le" -o "$RPM_ARCH" = "aarch64" -o "$RPM_ARCH" = "riscv64" ]; then
skips="$skips or TestPillowHandler_JPEG2K"
fi