Skip to content

Added CMYK to RGB unpacker #7310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 3 commits into from
Oct 6, 2023
Merged

Added CMYK to RGB unpacker #7310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00cec60
Added CMYK to RGB unpacker
radarhere Jul 29, 2023
787daa9
Merge branch 'main' into cmyk2rgb
radarhere Oct 6, 2023
b8c3065
Include CMYK to RGB convert as unpacker
radarhere Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Tests/test_lib_pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,10 @@ def test_RGB(self):
self.assert_unpack("RGB", "G;16N", 2, (0, 1, 0), (0, 3, 0), (0, 5, 0))
self.assert_unpack("RGB", "B;16N", 2, (0, 0, 1), (0, 0, 3), (0, 0, 5))

self.assert_unpack(
"RGB", "CMYK", 4, (250, 249, 248), (242, 241, 240), (234, 233, 233)
)

def test_RGBA(self):
self.assert_unpack("RGBA", "LA", 2, (1, 1, 1, 2), (3, 3, 3, 4), (5, 5, 5, 6))
self.assert_unpack(
Expand Down
2 changes: 1 addition & 1 deletion src/libImaging/Convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ rgb2cmyk(UINT8 *out, const UINT8 *in, int xsize) {
}
}

static void
void
cmyk2rgb(UINT8 *out, const UINT8 *in, int xsize) {
int x, nk, tmp;
for (x = 0; x < xsize; x++) {
Expand Down
2 changes: 2 additions & 0 deletions src/libImaging/Convert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
extern void
cmyk2rgb(UINT8 *out, const UINT8 *in, int xsize);
2 changes: 2 additions & 0 deletions src/libImaging/Unpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/

#include "Imaging.h"
#include "Convert.h"

#define R 0
#define G 1
Expand Down Expand Up @@ -1589,6 +1590,7 @@ static struct {
{"RGB", "R;16B", 16, band016B},
{"RGB", "G;16B", 16, band116B},
{"RGB", "B;16B", 16, band216B},
{"RGB", "CMYK", 32, cmyk2rgb},

/* true colour w. alpha */
{"RGBA", "LA", 16, unpackRGBALA},
Expand Down