wbrawner/drawio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed image handling code

Browse source 
Former-commit-id: 12e6983e15
This commit is contained in:
David Benson 2017-03-29 14:18:26 +01:00
parent 9e8db13ce3
commit 0a7cf5fccd
1 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/com/mxgraph/io/mxVsdxCodec.java
View file

@ -30,11 +30,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import com.google.appengine.api.images.Image;
import com.google.appengine.api.images.ImagesService;
import com.google.appengine.api.images.ImagesServiceFactory;
import com.google.appengine.api.images.Transform;
import com.google.appengine.api.images.ImagesService.OutputEncoding;
import com.mxgraph.io.vsdx.Shape;
import com.mxgraph.io.vsdx.ShapePageId;
import com.mxgraph.io.vsdx.VsdxShape;
@ -49,6 +44,7 @@ import com.mxgraph.model.mxCell;
import com.mxgraph.model.mxGeometry;
import com.mxgraph.model.mxGraphModel;
import com.mxgraph.model.mxIGraphModel;
import com.mxgraph.online.GaeUtils;
import com.mxgraph.online.Utils;
import com.mxgraph.online.mxBase64;
import com.mxgraph.util.mxConstants;
@ -164,32 +160,11 @@ public class mxVsdxCodec
//Some BMP images are huge and doesn't show up in the browser, so, it is better to compress it as PNG
if (filename.toLowerCase().endsWith(".bmp"))
{
boolean isRunningGAE; //if running under Google App Engine, ImageIO is not available
try
{
Class.forName("com.google.appengine.api.images.ImagesServiceFactory");
isRunningGAE = true;
}
catch (Throwable t)
{
isRunningGAE = false;
}
try
{
if (isRunningGAE)
if (GaeUtils.isGae())
{
ImagesService imagesService = ImagesServiceFactory.getImagesService();
Image image = ImagesServiceFactory.makeImage(out.toByteArray());
//dummy transform
Transform transform = ImagesServiceFactory.makeCrop(0.0, 0.0, 1.0, 1.0);
//Use PNG format as it is lossless similar to BMP but compressed
Image newImage = imagesService.applyTransform(transform, image, OutputEncoding.PNG);
base64Str = StringUtils.newStringUtf8(Base64.encodeBase64(newImage.getImageData(), false));
base64Str = GaeUtils.convertBmp(out.toByteArray());
}
else
{