Revision: 6425
http://sourceforge.net/p/jump-pilot/code/6425
Author: ma15569
Date: 2020-09-06 14:11:32 +0000 (Sun, 06 Sep 2020)
Log Message:
-----------
Patch to partially solve #498 Most GeoTIFF drivers fail with a simple GeoTIFF
image
Modified Paths:
--------------
core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-05 09:45:01 UTC (rev 6424)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-06 14:11:32 UTC (rev 6425)
@@ -38,6 +38,8 @@
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.WorkbenchContext;
+import com.vividsolutions.jump.workbench.imagery.ReferencedImageException;
+import com.vividsolutions.jump.workbench.imagery.geoimg.GeoReferencedRaster;
import com.vividsolutions.jump.workbench.ui.Viewport;
/**
@@ -194,14 +196,23 @@
throws IOException {
if (filenameOrURL.toLowerCase().endsWith(".gif")
- || filenameOrURL.toLowerCase().endsWith(".png")
- || filenameOrURL.toLowerCase().endsWith(".tif")
- ||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
-
+ ||
filenameOrURL.toLowerCase().endsWith(".png")) {
RenderedOp renderedOp = JAI.create("fileload",
filenameOrURL);
return renderedOp.getAsBufferedImage(subset,
null).getData();
-
- } else if (filenameOrURL.toLowerCase().endsWith(".jpg")
+ }
+ else if (filenameOrURL.toLowerCase().endsWith(".tif")
+ ||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
+ GeoReferencedRaster geoRaster;
+ RenderedOp renderedOp;
+ try {
+ geoRaster = new GeoReferencedRaster(new
File(filenameOrURL).toURI().toString());
+ renderedOp = geoRaster.getImage();
+ } catch (ReferencedImageException e) {
+ // TODO Auto-generated catch block
+ renderedOp = JAI.create("fileload", filenameOrURL);
+ }
+ return renderedOp.getAsBufferedImage(subset,
null).getData();
+ } else if (filenameOrURL.toLowerCase().endsWith(".jpg")
|| filenameOrURL.toLowerCase().endsWith(".bmp")
||
filenameOrURL.toLowerCase().endsWith(".jp2")) {
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
