Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in stb_image psd loader.

Browse Source
This commit is contained in:
spartanj@gmail.com
2012-06-25 23:32:17 -03:00
parent dce1d97620
commit 661b9dad1d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eepp/helper/SOIL/stb_image.c
View File

@@ -3273,7 +3273,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
return epuc("bad compression", "PSD has an unknown compression format");
// Create the destination image.
out = (stbi_uc *) malloc(4 * w*h);
out = (stbi_uc *) malloc(channelCount * w*h);
if (!out) return epuc("outofmem", "Out of memory");
pixelCount = w*h;
@@ -3295,13 +3295,13 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
skip(s, h * channelCount * 2 );
// Read the RLE data by channel.
for (channel = 0; channel < 4; channel++) {
for (channel = 0; channel < channelCount; channel++) {
uint8 *p;
p = out+channel;
if (channel >= channelCount) {
// Fill this channel with default data.
for (i = 0; i < pixelCount; i++) *p = (channel == 3 ? 255 : 0), p += 4;
for (i = 0; i < pixelCount; i++) *p = (channel == 3 ? 255 : 0), p += channelCount;
} else {
// Read the RLE data.
count = 0;
@@ -3315,7 +3315,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
count += len;
while (len) {
*p = get8u(s);
p += 4;
p += channelCount;
len--;
}
} else if (len > 128) {
@@ -3328,7 +3328,7 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
count += len;
while (len) {
*p = val;
p += 4;
p += channelCount;
len--;
}
}
@@ -3341,17 +3341,17 @@ static stbi_uc *psd_load(stbi *s, int *x, int *y, int *comp, int req_comp)
// where each channel consists of an 8-bit value for each pixel in the image.
// Read the data by channel.
for (channel = 0; channel < 4; channel++) {
for (channel = 0; channel < channelCount; channel++) {
uint8 *p;
p = out + channel;
if (channel > channelCount) {
// Fill this channel with default data.
for (i = 0; i < pixelCount; i++) *p = channel == 3 ? 255 : 0, p += 4;
for (i = 0; i < pixelCount; i++) *p = channel == 3 ? 255 : 0, p += channelCount;
} else {
// Read the data.
for (i = 0; i < pixelCount; i++)
*p = get8u(s), p += 4;
*p = get8u(s), p += channelCount;
}
}
}