Skip to content

Update SampledImageReader.java #122

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

Closed
wants to merge 1 commit into from
Closed

Update SampledImageReader.java #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 23 additions & 45 deletions pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private static Rectangle clipRegion(PDImage pdImage, Rectangle region)
}

/**
* Returns the content of the given image as an AWT buffered image with an RGB color space.
* Returns the content of the given image as a newly created AWT buffered image with an RGB color space.
* If a color key mask is provided then an ARGB image is returned instead.
* This method never returns null.
* @param pdImage the image to read
Expand Down Expand Up @@ -385,7 +385,6 @@ private static BufferedImage from1Bit(PDImage pdImage, Rectangle clipped, final
final float[] decode = getDecodeArray(pdImage);
BufferedImage bim = null;
WritableRaster raster;
byte[] output;

DecodeOptions options = new DecodeOptions(currentSubsampling);
options.setSourceRegion(clipped);
Expand Down Expand Up @@ -432,58 +431,37 @@ private static BufferedImage from1Bit(PDImage pdImage, Rectangle clipped, final
{
raster = Raster.createBandedRaster(DataBuffer.TYPE_BYTE, width, height, 1, new Point(0, 0));
}
output = ((DataBufferByte) raster.getDataBuffer()).getData();
final boolean isIndexed = colorSpace instanceof PDIndexed;

int rowLen = inputWidth / 8;
if (inputWidth % 8 > 0)
{
rowLen++;
}

// read stream
byte value0;
byte value1;
if (isIndexed || decode[0] < decode[1])
{
value0 = 0;
value1 = (byte) 255;
}
else
{
value0 = (byte) 255;
value1 = 0;
}
byte[] buff = new byte[rowLen];

final byte[] output = ((DataBufferByte) raster.getDataBuffer()).getData();
int idx = 0;

// read stream byte per byte, invert pixel bits if necessary,
// and then simply shift bits out to the left, detecting set bits via sign
final boolean nosubsampling = currentSubsampling==1;
final int stride = (inputWidth + 7) / 8;
final int invert = colorSpace instanceof PDIndexed || decode[0] < decode[1] ? 0 : -1;
final int endX = startx + scanWidth;
final byte[] buff = new byte[stride];
for (int y = 0; y < starty + scanHeight; y++)
{
int x = 0;
int readLen = (int) IOUtils.populateBuffer(iis, buff);
if (y < starty || y % currentSubsampling > 0)
{
continue;
}
for (int r = 0; r < rowLen && r < readLen; r++)
int read = (int) IOUtils.populateBuffer(iis, buff);
if ( y >= starty && y % currentSubsampling == 0 )
{
int value = buff[r];
int mask = 128;
for (int i = 0; i < 8; i++)
for ( int x = startx, r = x / 8; r < stride && r < read; r++ )
{
if (x >= startx + scanWidth)
int value = (buff[r] ^ invert) << (24 + (x & 7));
for ( int count = Math.min(8 - (x & 7), endX - x); count > 0; x++, count-- )
{
break;
}
int bit = value & mask;
mask >>= 1;
if (x >= startx && x % currentSubsampling == 0)
{
output[idx++] = bit == 0 ? value0 : value1;
if ( nosubsampling || x % currentSubsampling == 0 )
{
if ( value < 0 ) output[idx] = (byte)255;
idx++;
}
value <<= 1;
}
x++;
}
}
if (readLen != rowLen)
if (read != stride)
{
LOG.warn("premature EOF, image will be incomplete");
break;
Expand Down