litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

fix: png to jpg conversion

Browse source
This commit is contained in:
Georgy Litvinov 2021-09-16 22:31:30 +02:00
parent 3191be6e53
commit 401bfc67ec
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/w2phtml/base/BinaryGraphicsDocument.java
View file

@ -232,7 +232,6 @@ public class BinaryGraphicsDocument implements OutputFile {
return; return;
} }
ByteArrayInputStream bis = new ByteArrayInputStream(blob); ByteArrayInputStream bis = new ByteArrayInputStream(blob);
try { try {
BufferedImage image = ImageIO.read(bis); BufferedImage image = ImageIO.read(bis);
if (image == null) { if (image == null) {
@ -243,20 +242,26 @@ public class BinaryGraphicsDocument implements OutputFile {
int width = image.getWidth(); int width = image.getWidth();
int leftOffset = offsets[3]; int leftOffset = offsets[3];
int topOffset = offsets[0]; int topOffset = offsets[0];
int newWidth = width - offsets[3] - offsets[1]; int croppedWidth = width - offsets[3] - offsets[1];
int newHeight = height - offsets[0] - offsets[2]; int croppedHeight = height - offsets[0] - offsets[2];
BufferedImage croppedImage = image.getSubimage(leftOffset, topOffset, newWidth , newHeight ); BufferedImage croppedImage = new BufferedImage(croppedWidth, croppedHeight, BufferedImage.TYPE_3BYTE_BGR);
ByteArrayOutputStream baos = new ByteArrayOutputStream(); int px[] = new int[croppedWidth * croppedHeight];
image.getRGB(leftOffset, topOffset, croppedWidth, croppedHeight, px, 0, croppedWidth);
croppedImage.setRGB(0, 0, croppedWidth, croppedHeight, px, 0, croppedWidth);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageIO.write(croppedImage, "JPG", baos); ImageIO.write(croppedImage, "JPG", baos);
sMimeType = MIMETypes.JPEG; sMimeType = MIMETypes.JPEG;
this.blob = baos.toByteArray(); this.blob = baos.toByteArray();
if (blob.length == 0) {
throw new IOException();
}
this.cropped = true; this.cropped = true;
updateFileName(offsets); updateFileName(offsets);
} catch (IOException e) { } catch (IOException e) {
logger.error("Image " + sFileName + " " + e.getLocalizedMessage()); logger.error("Error. Image " + sFileName + " " + e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
} catch (RasterFormatException e ) { } catch (RasterFormatException e ) {
logger.error("Image " + sFileName + " " + e.getLocalizedMessage()); logger.error("Error. Image " + sFileName + " " + e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -289,13 +294,11 @@ public class BinaryGraphicsDocument implements OutputFile {
ImageIO.write(resizedImage, "JPG", baos); ImageIO.write(resizedImage, "JPG", baos);
this.blob = baos.toByteArray(); this.blob = baos.toByteArray();
extractPPI(); extractPPI();
//logger.error(sFileName + " Vertical PPI " + this.verticalPPI);
//logger.error(sFileName + " Horizontal PPI " + this.horizontalPPI);
} else { } else {
logger.error("Image " + sFileName + " width = 0"); logger.error("Error. Image " + sFileName + " width = 0");
} }
} catch (IOException e) { } catch (IOException e) {
logger.error("Image " + sFileName + " " + e.getLocalizedMessage()); logger.error("Error. Image " + sFileName + " " + e.getLocalizedMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }