callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: fix #1790 Artifacts when opening tif images ...

Browse Source 
generated by matlabs blocproc function

Based on the suggested solution by Massimo, we should not compute the
remaining pixels per line but only at the end of the whole block, be it
tile or scanline.

I have not been able to find bw or palette examples that use load_separate
instead of load_contiguous, so that case is not tested. But, it also
doesn't make much sense to have planar when you have just one plane.

(cherry picked from commit 94de89febf)
This commit is contained in:
Jacob Boerema
2022-06-08 13:22:46 -04:00
parent 95f0822fc3
commit b061fac229
1 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
plug-ins/file-tiff/file-tiff-load.c
View File

@ -2478,26 +2478,21 @@ convert_bit2byte (const guchar *src,
gint width,
gint height)
{
gint y;
gint64 x = width * height;
for (y = 0; y < height; y++)
while (x >= 8)
{
gint x = width;
memcpy (dest, bit2byte + *src * 8, 8);
dest += 8;
x -= 8;
src++;
}
while (x >= 8)
{
memcpy (dest, bit2byte + *src * 8, 8);
dest += 8;
x -= 8;
src++;
}
if (x > 0)
{
memcpy (dest, bit2byte + *src * 8, x);
dest += x;
src++;
}
if (x > 0)
{
memcpy (dest, bit2byte + *src * 8, x);
dest += x;
src++;
}
}
@ -2507,26 +2502,21 @@ convert_2bit2byte (const guchar *src,
gint width,
gint height)
{
gint y;
gint64 x = width * height;
for (y = 0; y < height; y++)
while (x >= 4)
{
gint x = width;
memcpy (dest, _2bit2byte + *src * 4, 4);
dest += 4;
x -= 4;
src++;
}
while (x >= 4)
{
memcpy (dest, _2bit2byte + *src * 4, 4);
dest += 4;
x -= 4;
src++;
}
if (x > 0)
{
memcpy (dest, _2bit2byte + *src * 4, x);
dest += x;
src++;
}
if (x > 0)
{
memcpy (dest, _2bit2byte + *src * 4, x);
dest += x;
src++;
}
}
@ -2536,26 +2526,21 @@ convert_4bit2byte (const guchar *src,
gint width,
gint height)
{
gint y;
gint64 x = width * height;
for (y = 0; y < height; y++)
while (x >= 2)
{
gint x = width;
memcpy (dest, _4bit2byte + *src * 2, 2);
dest += 2;
x -= 2;
src++;
}
while (x >= 2)
{
memcpy (dest, _4bit2byte + *src * 2, 2);
dest += 2;
x -= 2;
src++;
}
if (x > 0)
{
memcpy (dest, _4bit2byte + *src * 2, x);
dest += x;
src++;
}
if (x > 0)
{
memcpy (dest, _4bit2byte + *src * 2, x);
dest += x;
src++;
}
}