Changeset 8149 in josm for trunk/src/com/kitfox/svg

Timestamp:

2015-03-22T23:16:08+01:00 (10 years ago)

Author:

stoecker

Message:

fix #11257 - Remove apache.commons.codecs - patch by Florian Schaefer

Location:

trunk/src/com/kitfox/svg

Files:

• SVGUniverse.java (modified) (3 diffs)
• app/data/Handler.java (modified) (2 diffs)

trunk/src/com/kitfox/svg/SVGUniverse.java

@@ -62 +62 @@
 import java.util.zip.GZIPInputStream;
 import javax.imageio.ImageIO;
+import javax.xml.bind.DatatypeConverter;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -191 +192 @@
             if (content.startsWith("base64"))
             {
-                content = content.substring(6);
                 try
                 {
-                    byte[] buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
+                    byte[] buf = DatatypeConverter.parseBase64Binary(content.substring(6));
                     ByteArrayInputStream bais = new ByteArrayInputStream(buf);
                     BufferedImage img = ImageIO.read(bais);
@@ -214 +214 @@
 
                     return url;
-                } catch (IOException ex)
+                }
+                catch (IOException | IllegalArgumentException ex)
                 {
                     Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING,

trunk/src/com/kitfox/svg/app/data/Handler.java

@@ -45 +45 @@
 import java.util.logging.Logger;
 
+import javax.xml.bind.DatatypeConverter;
+
 /**
  *
@@ -67 +69 @@
             if (content.startsWith("base64,"))
             {
-                content = content.substring(7);
                 try
                 {
-                    buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
+                    buf = DatatypeConverter.parseBase64Binary(content.substring(7));
                 }
-                catch (IOException e)
+                catch (IllegalArgumentException e)
                 {
                     Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);