python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-27 10:26:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3858 from kulikjak/master

Browse Source 
Fix SPARC memory alignment issues in Pack/Unpack functions
This commit is contained in:
Hugo 2019-06-27 21:27:37 +03:00 committed by GitHub
commit 219f277129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libImaging/Pack.c
View File

@ -251,6 +251,15 @@ ImagingPackRGB(UINT8* out, const UINT8* in, int pixels)
{ {
int i = 0; int i = 0;
/* RGB triplets */ /* RGB triplets */
#ifdef __sparc
/* SPARC CPUs cannot read integers from nonaligned addresses. */
for (; i < pixels; i++) {
out[0] = in[R];
out[1] = in[G];
out[2] = in[B];
out += 3; in += 4;
}
#else
for (; i < pixels-1; i++) { for (; i < pixels-1; i++) {
((UINT32*)out)[0] = ((UINT32*)in)[i]; ((UINT32*)out)[0] = ((UINT32*)in)[i];
out += 3; out += 3;
@ -261,6 +270,7 @@ ImagingPackRGB(UINT8* out, const UINT8* in, int pixels)
out[2] = in[i*4+B]; out[2] = in[i*4+B];
out += 3; out += 3;
} }
#endif
} }
void void

33
src/libImaging/Unpack.c
View File

@ -480,6 +480,16 @@ void
ImagingUnpackRGB(UINT8* _out, const UINT8* in, int pixels) ImagingUnpackRGB(UINT8* _out, const UINT8* in, int pixels)
{ {
int i = 0; int i = 0;
#ifdef __sparc
/* SPARC CPUs cannot read integers from nonaligned addresses. */
for (; i < pixels; i++) {
_out[R] = in[0];
_out[G] = in[1];
_out[B] = in[2];
_out[A] = 255;
_out += 4; in += 3;
}
#else
UINT32* out = (UINT32*) _out; UINT32* out = (UINT32*) _out;
/* RGB triplets */ /* RGB triplets */
for (; i < pixels-1; i++) { for (; i < pixels-1; i++) {
@ -490,6 +500,7 @@ ImagingUnpackRGB(UINT8* _out, const UINT8* in, int pixels)
out[i] = MAKE_UINT32(in[0], in[1], in[2], 255); out[i] = MAKE_UINT32(in[0], in[1], in[2], 255);
in += 3; in += 3;
} }
#endif
} }
void void
@ -1085,22 +1096,44 @@ static void
copy4skip1(UINT8* _out, const UINT8* in, int pixels) copy4skip1(UINT8* _out, const UINT8* in, int pixels)
{ {
int i; int i;
#ifdef __sparc
/* SPARC CPUs cannot read integers from nonaligned addresses. */
for (i = 0; i < pixels; i++) {
_out[0] = in[0];
_out[1] = in[1];
_out[2] = in[2];
_out[3] = in[3];
_out += 4; in += 5;
}
#else
UINT32* out = (UINT32*) _out; UINT32* out = (UINT32*) _out;
for (i = 0; i < pixels; i++) { for (i = 0; i < pixels; i++) {
out[i] = *(UINT32*)&in[0]; out[i] = *(UINT32*)&in[0];
in += 5; in += 5;
} }
#endif
} }
static void static void
copy4skip2(UINT8* _out, const UINT8* in, int pixels) copy4skip2(UINT8* _out, const UINT8* in, int pixels)
{ {
int i; int i;
#ifdef __sparc
/* SPARC CPUs cannot read integers from nonaligned addresses. */
for (i = 0; i < pixels; i++) {
_out[0] = in[0];
_out[1] = in[1];
_out[2] = in[2];
_out[3] = in[3];
_out += 4; in += 6;
}
#else
UINT32* out = (UINT32*) _out; UINT32* out = (UINT32*) _out;
for (i = 0; i < pixels; i++) { for (i = 0; i < pixels; i++) {
out[i] = *(UINT32*)&in[0]; out[i] = *(UINT32*)&in[0];
in += 6; in += 6;
} }
#endif
} }