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

Update image file name after crop operation.

Browse source
This commit is contained in:
Georgy Litvinov 2020-12-07 21:07:32 +01:00
parent f59c14e529
commit a9cd6d2130
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,7 +177,12 @@ public class BinaryGraphicsDocument implements OutputFile {
*/ */
public void write(OutputStream os) throws IOException { public void write(OutputStream os) throws IOException {
if (blob!=null) { if (blob!=null) {
os.write(blob, nOff, nLen); if (cropped) {
os.write(blob);
} else {
os.write(blob, nOff, nLen);
}
} }
} }
@ -231,16 +236,17 @@ public class BinaryGraphicsDocument implements OutputFile {
int height = image.getHeight(); int height = image.getHeight();
int width = image.getWidth(); int width = image.getWidth();
String formatName = MIMETypes.getFormatType(blob); String formatName = MIMETypes.getFormatType(blob);
int xTopLeft = offsets[3]; int leftOffset = offsets[3];
int yTopLeft = offsets[0]; int topOffset = offsets[0];
int xBottomRight = width - offsets[3] - offsets[1]; int newWidth = width - offsets[3] - offsets[1];
int yBottomRight = height - offsets[0] - offsets[2]; int newHeight = height - offsets[0] - offsets[2];
BufferedImage croppedImage = image.getSubimage(xTopLeft, yTopLeft, xBottomRight , yBottomRight ); BufferedImage croppedImage = image.getSubimage(leftOffset, topOffset, newWidth , newHeight );
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageIO.write(croppedImage, "JPG", baos); ImageIO.write(croppedImage, "JPG", baos);
sMimeType = MIMETypes.JPEG; sMimeType = MIMETypes.JPEG;
blob = baos.toByteArray(); this.blob = baos.toByteArray();
cropped = true; this.cropped = true;
updateFileName(offsets);
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -250,6 +256,16 @@ public class BinaryGraphicsDocument implements OutputFile {
} }
private void updateFileName(int[] offsets) {
StringBuilder croppedFileName = new StringBuilder();
croppedFileName.append(sFileName.substring(0, sFileName.lastIndexOf('.')));
for (int i = 0; i < offsets.length; i++) {
croppedFileName.append("-" + offsets[i]);
}
croppedFileName.append(".jpg");
sFileName = croppedFileName.toString();
}
private int[] getOffsets(StyleWithProperties style) { private int[] getOffsets(StyleWithProperties style) {
/* top, right, bottom, left */ /* top, right, bottom, left */
int[] offsets = { 0, 0, 0, 0 }; int[] offsets = { 0, 0, 0, 0 };

2
src/main/java/w2phtml/xhtml/content/DrawParser.java
View file

@ -589,7 +589,7 @@ public class DrawParser extends Parser {
} }
else { else {
// In all other cases, create an img element // In all other cases, create an img element
if (bgd != null && !bgd.isLinked() && !bgd.isRecycled() && !bEmbedImg) { if (bgd != null && !bgd.isLinked() && !bEmbedImg) {
converter.addDocument(bgd); converter.addDocument(bgd);
} }
Element image = converter.createElement("img"); Element image = converter.createElement("img");