remove check for svg by using new FileFormat.canLoadAtZoom API

Author: Michael5601

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java

@@ -43,6 +43,7 @@
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.internal.DPIUtil.ElementAtZoom;
 import org.eclipse.swt.internal.NativeImageLoader;
+import org.eclipse.swt.internal.image.FileFormat;
 
 /**
  * An image descriptor that loads its image information from a file.
@@ -54,7 +55,7 @@ private class ImageProvider implements ImageFileNameProvider {
 		@Override
 		public String getImagePath(int zoom) {
 			final boolean logIOException = zoom == 100;
-			if (zoom == 100) {
+			if (canLoadAtZoom(zoom) || zoom == 100) {
 				return getFilePath(name, logIOException);
 			}
 			SourceAtZoom<String> xName = getxName(name, zoom);
@@ -155,8 +156,8 @@ public ImageData getImageData(int zoom) {
 	 *         file cannot be found
 	 */
 	private SourceAtZoom<InputStream> getStream(int zoom) {
-		if (zoom == 100) {
-			return getStream(new SourceAtZoom<>(name, 100));
+		if (canLoadAtZoom(zoom) || zoom == 100) {
+			return getStream(new SourceAtZoom<>(name, zoom));
 		}
 
 		SourceAtZoom<InputStream> xstream = getStream(getxName(name, zoom));
@@ -172,6 +173,18 @@ private SourceAtZoom<InputStream> getStream(int zoom) {
 		return null;
 	}
 
+	@SuppressWarnings("restriction")
+	private boolean canLoadAtZoom(int zoom) {
+		try (InputStream in = getStream(new SourceAtZoom<>(name, zoom)).source()) {
+			if (in != null) {
+				return FileFormat.canLoadAtZoom(new ElementAtZoom<>(in, 100), zoom);
+			}
+		} catch (IOException e) {
+			Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+		}
+		return false;
+	}
+
 	/**
 	 * try to obtain a stream for a given name, if the name does not match a valid
 	 * resource null is returned
@@ -180,9 +193,9 @@ private SourceAtZoom<InputStream> getStream(int zoom) {
 	 * @return an {@link InputStream} to read from, or <code>null</code> if fileName
 	 *         does not denotes an existing resource
 	 */
+	@SuppressWarnings("resource")
 	private SourceAtZoom<InputStream> getStream(SourceAtZoom<String> fileName) {
 		if (fileName != null) {
-			// TODO DO we need to close these?
 			if (location != null) {
 				return new SourceAtZoom<>(location.getResourceAsStream(fileName.source()), fileName.zoom());
 			}

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java

@@ -42,6 +42,7 @@
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.internal.DPIUtil.ElementAtZoom;
 import org.eclipse.swt.internal.NativeImageLoader;
+import org.eclipse.swt.internal.image.FileFormat;
 
 /**
  * An ImageDescriptor that gets its information from a URL. This class is not
@@ -161,10 +162,7 @@ public ImageData getImageData(int zoom) {
 	private static ImageData getImageData(String url, int zoom) {
 		URL tempURL = getURL(url);
 		if (tempURL != null) {
-			if (tempURL.toString().endsWith(".svg")) { //$NON-NLS-1$
-				return getImageData(tempURL, 100, zoom);
-			}
-			if (zoom == 100) {
+			if (canLoadAtZoom(zoom, tempURL) || zoom == 100) {
 				return getImageData(tempURL, 100, zoom);
 			}
 			SourceAtZoom<URL> xUrl = getxURL(tempURL, zoom);
@@ -185,6 +183,18 @@ private static ImageData getImageData(String url, int zoom) {
 		return null;
 	}
 
+	@SuppressWarnings("restriction")
+	private static boolean canLoadAtZoom(int zoom, URL tempURL) {
+		try (InputStream in = getStream(tempURL)) {
+			if (in != null) {
+				return FileFormat.canLoadAtZoom(new ElementAtZoom<>(in, 100), zoom);
+			}
+		} catch (IOException e) {
+			Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+		}
+		return false;
+	}
+
 	@SuppressWarnings("restriction")
 	private static ImageData getImageData(URL url, int fileZoom, int targetZoom) {
 		ImageData result = null;