@@ -1328,7 +1328,7 @@ public ImageData getImageData (int zoom) {
13281328 if (zoomLevelToImageHandle .containsKey (zoom )) {
13291329 return zoomLevelToImageHandle .get (zoom ).getImageData ();
13301330 }
1331- return this .imageProvider .newImageData (new ZoomContext ( zoom ) );
1331+ return this .imageProvider .newImageData (zoom );
13321332}
13331333
13341334
@@ -2007,7 +2007,7 @@ public Collection<Integer> getPreservedZoomLevels() {
20072007
20082008 protected abstract ElementAtZoom <ImageData > loadImageData (int zoom );
20092009
2010- abstract ImageData newImageData (ZoomContext zoomContext );
2010+ abstract ImageData newImageData (int zoom );
20112011
20122012 abstract AbstractImageProviderWrapper createCopy (Image image );
20132013
@@ -2068,8 +2068,8 @@ protected Rectangle getBounds(int zoom) {
20682068 }
20692069
20702070 @ Override
2071- ImageData newImageData (ZoomContext zoomContext ) {
2072- return getScaledImageData (zoomContext . targetZoom () );
2071+ ImageData newImageData (int zoom ) {
2072+ return getScaledImageData (zoom );
20732073 }
20742074
20752075 @ Override
@@ -2095,18 +2095,18 @@ private abstract class ImageFromImageDataProviderWrapper extends AbstractImagePr
20952095 void initImage () {
20962096 // As the init call configured some Image attributes (e.g. type)
20972097 // it must be called
2098- newImageData (new ZoomContext ( 100 ) );
2098+ newImageData (100 );
20992099 }
21002100
21012101 @ Override
2102- ImageData newImageData (ZoomContext zoomContext ) {
2102+ ImageData newImageData (int zoom ) {
21032103 Function <Integer , ImageData > imageDataRetrieval = zoomToRetrieve -> {
2104- ImageHandle handle = initializeHandleFromSource (zoomContext );
2104+ ImageHandle handle = initializeHandleFromSource (new ZoomContext ( zoom ) );
21052105 ImageData data = handle .getImageData ();
21062106 handle .destroy ();
21072107 return data ;
21082108 };
2109- return (ImageData ) cachedImageData .computeIfAbsent (zoomContext . targetZoom () , imageDataRetrieval ).clone ();
2109+ return (ImageData ) cachedImageData .computeIfAbsent (zoom , imageDataRetrieval ).clone ();
21102110 }
21112111
21122112 @ Override
@@ -2270,15 +2270,15 @@ protected Rectangle getBounds(int zoom) {
22702270 }
22712271
22722272 @ Override
2273- ImageData newImageData (ZoomContext zoomContext ) {
2274- int targetZoom = zoomContext . targetZoom () ;
2273+ ImageData newImageData (int zoom ) {
2274+ int targetZoom = zoom ;
22752275 if (zoomLevelToImageHandle .isEmpty ()) {
22762276 return createBaseHandle (targetZoom ).getImageData ();
22772277 }
22782278 // if a GC is initialized with an Image (memGC != null), the image data must not be resized, because it would
22792279 // be a destructive operation. Therefor, a new handle is created for the requested zoom
22802280 if (memGC != null ) {
2281- return newImageHandle (zoomContext ).getImageData ();
2281+ return newImageHandle (new ZoomContext ( zoom ) ).getImageData ();
22822282 }
22832283 return getScaledImageData (targetZoom );
22842284 }
@@ -2392,14 +2392,14 @@ Object getProvider() {
23922392 }
23932393
23942394 @ Override
2395- ImageData newImageData (ZoomContext zoomContext ) {
2395+ ImageData newImageData (int zoom ) {
23962396 Function <Integer , ImageData > imageDataRetrival = zoomToRetrieve -> {
23972397 ImageHandle handle = initializeHandleFromSource (zoomToRetrieve );
23982398 ImageData data = handle .getImageData ();
23992399 handle .destroy ();
24002400 return data ;
24012401 };
2402- return (ImageData ) cachedImageData .computeIfAbsent (zoomContext . targetZoom () , imageDataRetrival ).clone ();
2402+ return (ImageData ) cachedImageData .computeIfAbsent (zoom , imageDataRetrival ).clone ();
24032403 }
24042404
24052405 @ Override
@@ -2432,7 +2432,7 @@ private class ImageFileNameProviderWrapper extends BaseImageProviderWrapper<Imag
24322432 super (provider , ImageFileNameProvider .class );
24332433 // Checks for the contract of the passed provider require
24342434 // checking for valid image data creation
2435- newImageData (new ZoomContext ( DPIUtil .getDeviceZoom () ));
2435+ newImageData (DPIUtil .getDeviceZoom ());
24362436 }
24372437
24382438 @ Override
@@ -2735,8 +2735,8 @@ protected long configureGCData(GCData data) {
27352735 }
27362736
27372737 @ Override
2738- ImageData newImageData (ZoomContext zoomContext ) {
2739- return loadImageData (zoomContext . targetZoom ).element ();
2738+ ImageData newImageData (int zoom ) {
2739+ return loadImageData (zoom ).element ();
27402740 }
27412741
27422742 @ Override
0 commit comments