python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-18 20:41:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5384 from radarhere/core_tags

Browse Source
This commit is contained in:
Hugo van Kemenade 2021-04-15 13:10:25 +03:00 committed by GitHub
commit 85d251b479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/PIL/TiffTags.py
View File

@ -485,9 +485,6 @@ LIBTIFF_CORE = {
65537, 65537,
} }
LIBTIFF_CORE.remove(301) # Array of short, crashes
LIBTIFF_CORE.remove(532) # Array of long, crashes
LIBTIFF_CORE.remove(255) # We don't have support for subfiletypes LIBTIFF_CORE.remove(255) # We don't have support for subfiletypes
LIBTIFF_CORE.remove(322) # We don't have support for writing tiled images with libtiff LIBTIFF_CORE.remove(322) # We don't have support for writing tiled images with libtiff
LIBTIFF_CORE.remove(323) # Tiled images LIBTIFF_CORE.remove(323) # Tiled images

10
src/encode.c
View File

@ -644,10 +644,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
int key_int, status, is_core_tag, is_var_length, num_core_tags, i; int key_int, status, is_core_tag, is_var_length, num_core_tags, i;
TIFFDataType type = TIFF_NOTYPE; TIFFDataType type = TIFF_NOTYPE;
// This list also exists in TiffTags.py // This list also exists in TiffTags.py
const int core_tags[] = {256, 257, 258, 259, 262, 263, 266, 269, 274, const int core_tags[] = {256, 257, 258, 259, 262, 263, 266, 269, 274,
277, 278, 280, 281, 340, 341, 282, 283, 284, 277, 278, 280, 281, 340, 341, 282, 283, 284,
286, 287, 296, 297, 320, 321, 338, 32995, 32998, 286, 287, 296, 297, 320, 321, 338, 32995, 32998,
32996, 339, 32997, 330, 531, 530, 65537}; 32996, 339, 32997, 330, 531, 530, 65537, 301, 532};
Py_ssize_t tags_size; Py_ssize_t tags_size;
PyObject *item; PyObject *item;
@ -790,7 +790,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
int stride = 256; int stride = 256;
if (len != 768) { if (len != 768) {
PyErr_SetString( PyErr_SetString(
PyExc_ValueError, "Requiring 768 items for for Colormap"); PyExc_ValueError, "Requiring 768 items for Colormap");
return NULL; return NULL;
} }
UINT16 *av; UINT16 *av;