Revision: 6466
http://sourceforge.net/p/jump-pilot/code/6466
Author: ma15569
Date: 2020-09-14 09:38:00 +0000 (Mon, 14 Sep 2020)
Log Message:
-----------
reverted/modified some changes
Modified Paths:
--------------
core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
core/trunk/src/org/openjump/core/rasterimage/TiffUtils.java
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-14 08:22:33 UTC (rev 6465)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-14 09:38:00 UTC (rev 6466)
@@ -117,9 +117,8 @@
}
}
- Envelope envelope = getGeoReferencing(fileNameOrURL);
- //Envelope envelope = getGeoReferencing(fileNameOrURL,
true,
- // new Point(bImage.getWidth(),
bImage.getHeight()));
+ Envelope envelope = getGeoReferencing(fileNameOrURL,
true,
+ new Point(bImage.getWidth(),
bImage.getHeight()));
double cellSize = (envelope.getMaxX() -
envelope.getMinX())
/ bImage.getWidth();
return new ImageAndMetadata(bImage, new
Metadata(envelope,
@@ -136,7 +135,7 @@
int imgWidth = tiffMetadata.getColsCount();
int imgHeight = tiffMetadata.getRowsCount();
- Envelope imageEnvelope =
getGeoReferencing(fileNameOrURL);
+ Envelope imageEnvelope = tiffMetadata.getEnvelope();
// Envelope imageEnvelope =
getGeoReferencing(fileNameOrURL, true,
// new Point(imgWidth, imgHeight));
@@ -422,11 +421,11 @@
* @throws ReferencedImageException
*/
- public static Envelope getGeoReferencing(String fileName) throws
ReferencedImageException {
+/* public static Envelope getGeoReferencing(String fileName) throws
ReferencedImageException {
GeoReferencedRaster geoRaster = new
GeoReferencedRaster(new File(fileName).toURI().toString());
return geoRaster.getEnvelope();
- }
+ }*/
/**
* Substituted by method getGeoReferencing(String fileName)
Modified: core/trunk/src/org/openjump/core/rasterimage/TiffUtils.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/TiffUtils.java 2020-09-14
08:22:33 UTC (rev 6465)
+++ core/trunk/src/org/openjump/core/rasterimage/TiffUtils.java 2020-09-14
09:38:00 UTC (rev 6466)
@@ -1,7 +1,5 @@
package org.openjump.core.rasterimage;
-import static org.openjump.core.rasterimage.RasterImageIO.getGeoReferencing;
-
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.NoninvertibleTransformException;
@@ -63,7 +61,7 @@
}
// Envelope wholeImageEnvelope =
getGeoReferencing(tiffFile.getAbsolutePath(), true, new Point
(originalImageWidth, originalImageHeight));
- Envelope wholeImageEnvelope =
getGeoReferencing(tiffFile.getAbsolutePath());
+ Envelope wholeImageEnvelope = tiffMetadata.getEnvelope();
if(requestedRes == null) {
requestedRes = cellSize;
}
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
