Calculating height and width every time getBounds is called

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -2121,23 +2121,17 @@ private class ImageFileNameProviderWrapper extends AbstractImageProviderWrapper
 	 */
 	private final ImageFileNameProvider provider;
 	private boolean isDestroyed;
-	private int width;
-	private int height;
-	private final static int BASE_ZOOM = 100;
 
 	ImageFileNameProviderWrapper(ImageFileNameProvider provider) {
 		checkProvider(provider, ImageFileNameProvider.class);
 		this.provider = provider;
-		ImageHandle handleAt100 = getImageMetadata(BASE_ZOOM);
-		width = handleAt100.width;
-		height = handleAt100.height;
-		destroyHandle(BASE_ZOOM);
 	}
 
 	@Override
 	protected Rectangle getBounds(int zoom) {
-		Rectangle rectangle = new Rectangle(0, 0, width, height);
-		return DPIUtil.scaleBounds(rectangle, zoom, BASE_ZOOM);
+		ImageData imageData = getImageData(zoom);
+		Rectangle rectangle = new Rectangle(0, 0, imageData.width, imageData.height);
+		return rectangle;
 	}
 
 	@Override
@@ -2198,24 +2192,18 @@ private class ImageDataProviderWrapper extends AbstractImageProviderWrapper {
 	 * ImageDataProvider to provide ImageData at various Zoom levels
 	 */
 	private final ImageDataProvider provider;
-	private int width;
-	private int height;
 	private boolean isDestroyed;
-	private final static int BASE_ZOOM = 100;
 
 	ImageDataProviderWrapper(ImageDataProvider provider) {
 		checkProvider(provider, ImageDataProvider.class);
 		this.provider = provider;
-		ImageHandle handleAt100 = getImageMetadata(BASE_ZOOM);
-		width = handleAt100.width;
-		height = handleAt100.height;
-		destroyHandle(BASE_ZOOM);
 	}
 
 	@Override
 	protected Rectangle getBounds(int zoom) {
-		Rectangle rectangle = new Rectangle(0, 0, width, height);
-		return DPIUtil.scaleBounds(rectangle, zoom, BASE_ZOOM);
+		ImageData imageData = getImageData(zoom);
+		Rectangle rectangle = new Rectangle(0, 0, imageData.width, imageData.height);
+		return rectangle;
 	}
 
 	@Override