cleanup

Author: Michael5601

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

@@ -1128,9 +1128,6 @@ private int calculateZoomForImage(int gcZoom, int srcWidth, int srcHeight, int d
 		if (getAllCurrentMonitorZooms().contains(imageZoom)) {
 			return imageZoom;
 		}
-		if(this.image.createdWithTargetSize()) {
-			return imageZoom;
-		}
 		if (imageZoom > 150) {
 			return 200;
 		}

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

@@ -566,12 +566,7 @@ public Image (Device device, String filename) {
 public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	super(device);
 	this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
-	if(imageFileNameProvider instanceof SizeAwareImageFileNameProvider) {
-		if (imageFileNameProvider.getImagePath(16, 16) == null) {
-			SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
-					": ImageFileNameProvider [" + imageFileNameProvider + "] returns null fileName at 100% zoom.");
-		}
-	} else {
+	if (!(imageFileNameProvider instanceof SizeAwareImageFileNameProvider)) {
 		if (imageFileNameProvider.getImagePath(100) == null) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
 				": ImageFileNameProvider [" + imageFileNameProvider + "] returns null fileName at 100% zoom.");
@@ -613,12 +608,7 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 public Image(Device device, ImageDataProvider imageDataProvider) {
 	super(device);
 	this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
-	if (imageDataProvider instanceof SizeAwareImageDataProvider) {
-		if (imageDataProvider.getImageData(16, 16) == null) {
-			SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
-					": ImageFileNameProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
-		}
-	} else {
+	if (!(imageDataProvider instanceof SizeAwareImageDataProvider)) {
 		if (imageDataProvider.getImageData(100) == null) {
 			SWT.error(SWT.ERROR_INVALID_ARGUMENT, null,
 					": ImageDataProvider [" + imageDataProvider + "] returns null ImageData at 100% zoom.");
@@ -1177,7 +1167,7 @@ public Color getBackground() {
 public Rectangle getBounds() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	if(this.imageProvider.isSizeAware()) {
-		return getBounds(16, 16);
+		return new Rectangle(0, 0, 16, 16);
 	} else {
 		return getBounds(100);
 	}
@@ -1193,11 +1183,6 @@ Rectangle getBounds(int zoom) {
 	return this.imageProvider.getBounds(zoom);
 }
 
-Rectangle getBounds(int targetWidth, int targetHeight) {
-	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	return this.imageProvider.getBounds(targetWidth, targetHeight);
-}
-
 /**
  * Returns the bounds of the receiver. The rectangle will always
  * have x and y values of 0, and the width and height of the
@@ -1960,8 +1945,6 @@ public boolean isSizeAware (){
 
 	protected abstract Rectangle getBounds(int zoom);
 
-	protected abstract Rectangle getBounds(int targetWidth, int targetHeight);
-
 	protected long configureGCData(GCData data) {
 		return configureGC(data, 100);
 	}
@@ -1988,8 +1971,8 @@ protected ImageHandle newImageHandle(int zoom) {
 	}
 
 	protected ImageHandle newImageHandle(int targetWidth, int targetHeight) {
-		ImageData resizedData = getImageData(targetWidth, targetHeight);
-		return init(resizedData, targetWidth, targetHeight);
+		ImageData imageData = getImageData(targetWidth, targetHeight);
+		return init(imageData, targetWidth, targetHeight);
 	}
 
 	protected final ImageHandle newImageHandle(ImageData data, int zoom) {
@@ -2028,11 +2011,6 @@ protected Rectangle getBounds(int zoom) {
 		return DPIUtil.scaleUp(rectangle, zoom);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	ImageData newImageData(int zoom) {
 		return getScaledImageData(zoom);
@@ -2138,11 +2116,6 @@ protected Rectangle getBounds(int zoom) {
 		return DPIUtil.scaleUp(rectangle, zoom);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 		return new ElementAtZoom<>(imageDataAtBaseZoom, baseZoom);
@@ -2175,11 +2148,6 @@ protected Rectangle getBounds(int zoom) {
 		return DPIUtil.scaleUp(rectangle, zoom);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	protected ElementAtZoom<ImageData> loadImageData(int zoom) {
 		ImageData scaledSource = DPIUtil.scaleImageData(device, srcAt100, zoom, 100);
@@ -2232,11 +2200,6 @@ protected Rectangle getBounds(int zoom) {
 		return new Rectangle(0, 0, scaledImageData.width, scaledImageData.height);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	AbstractImageProviderWrapper createCopy(Image image) {
 		return image.new ImageDataLoaderStreamProviderWrapper(inputStreamData);
@@ -2273,11 +2236,6 @@ protected Rectangle getBounds(int zoom) {
 		return DPIUtil.scaleUp(rectangle, zoom);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	ImageData newImageData(int zoom) {
 		if (zoomLevelToImageHandle.isEmpty()) {
@@ -2453,12 +2411,6 @@ protected Rectangle getBounds(int zoom) {
 		ImageData imageData = getImageData(zoom);
 		return new Rectangle(0, 0, imageData.width, imageData.height);
 	}
-
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		ImageData imageData = getImageData(targetWidth, targetHeight);
-		return new Rectangle(0, 0, imageData.width, imageData.height);
-	}
 }
 
 private class ImageFileNameProviderWrapper extends BaseImageProviderWrapper<ImageFileNameProvider> {
@@ -2756,11 +2708,6 @@ protected Rectangle getBounds(int zoom) {
 		return DPIUtil.scaleBounds(rectangle, zoom, 100);
 	}
 
-	@Override
-	protected Rectangle getBounds(int targetWidth, int targetHeight) {
-		return new Rectangle(0, 0, targetWidth, targetHeight);
-	}
-
 	@Override
 	protected long configureGCData(GCData data) {
 		return configureGC(data, currentZoom);

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_internal_GCDrawImageAtTargetSize.java

@@ -92,7 +92,7 @@ public void test_GC_ImageDataProvider() {
 			int height = rect.height;
 			GC gc = e.gc;
 			int x = 0, y = 0;
-			gc.drawImage (imageWithDataProvider, 0, 0, width, height, x, y, 34, 200);
+			gc.drawImage (imageWithDataProvider, 0, 0, width, height, x, y, 80, 57);
 		});
 		shell.setSize (600, 400);
 		shell.open ();