Skip to content

reduce multiplication operations in SampledImageReader #425

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

Open
valerybokov wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

reduce multiplication operations in SampledImageReader #425

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
15 changes: 10 additions & 5 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 @@ -285,10 +285,14 @@ private static void readRasterFromAny(PDImage pdImage, WritableRaster raster)
final boolean isIndexed = colorSpace instanceof PDIndexed;

// calculate row padding
int padding = 0;
if (inputWidth * numComponents * bitsPerComponent % 8 > 0)
int padding = inputWidth * numComponents * bitsPerComponent % 8;
if (padding > 0)
{
padding = 8 - (inputWidth * numComponents * bitsPerComponent % 8);
padding = 8 - padding;
}
else
{
padding = 0;
}

// read stream
Expand Down Expand Up @@ -498,10 +502,11 @@ private static BufferedImage from8bit(PDImage pdImage, WritableRaster raster, Re
{
// we just need to copy all sample data, then convert to RGB image.
int inputResult = input.readNBytes(bank, 0, bank.length);
if (inputResult != (long) width * height * numComponents)
long tmpResult = (long) width * height * numComponents;
if (inputResult != tmpResult)
{
LOG.debug("Tried reading {} bytes but only {} bytes read",
(long) width * height * numComponents, inputResult);
tmpResult, inputResult);
}
return pdImage.getColorSpace().toRGBImage(raster);
}
Expand Down