Revision: 6435
http://sourceforge.net/p/jump-pilot/code/6435
Author: ma15569
Date: 2020-09-07 14:06:10 +0000 (Mon, 07 Sep 2020)
Log Message:
-----------
correct error
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-07 11:46:22 UTC (rev 6434)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-07 14:06:10 UTC (rev 6435)
@@ -327,8 +327,12 @@
}
else if (filenameOrURL.toLowerCase().endsWith(".tif")
||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
- return TiffUtils.getRenderedOp(new
File(filenameOrURL)).getAsBufferedImage(subset, null).getData();
-
+ renderedOp= TiffUtils.getRenderedOp(new
File(filenameOrURL));
+
+ return renderedOp.getData(rectangle)
+ .getSampleDouble(col, row, band);
+
+
} else if (filenameOrURL.toLowerCase().endsWith(".jpg")) {
// PlanarImage pimage;
@@ -379,13 +383,15 @@
return new Point(pImage.getWidth(),
pImage.getHeight());
}
- } else if (filenameOrURL.toLowerCase().endsWith(".tif")
+ }else if (filenameOrURL.toLowerCase().endsWith(".tif")
||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
+ RenderedOp renderedOp;
renderedOp= TiffUtils.getRenderedOp(new
File(filenameOrURL));
-
- return renderedOp.getData(rectangle)
- .getSampleDouble(col, row, band);
-
+
+ if (renderedOp != null) {
+ return new Point(renderedOp.getWidth(),
renderedOp.getHeight());
+ }
+
} else if (filenameOrURL.toLowerCase().endsWith(".flt")) {
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
