Revision: 6432
http://sourceforge.net/p/jump-pilot/code/6432
Author: ma15569
Date: 2020-09-07 07:44:45 +0000 (Mon, 07 Sep 2020)
Log Message:
-----------
Optimized code
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 07:40:36 UTC (rev 6431)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageIO.java
2020-09-07 07:44:45 UTC (rev 6432)
@@ -322,27 +322,13 @@
renderedOp = javax.media.jai.JAI.create("fileload",
filenameOrURL);
-
-
- return renderedOp.getData(rectangle)
+ return renderedOp.getData(rectangle)
.getSampleDouble(col, row, band);
- }else if (filenameOrURL.toLowerCase().endsWith(".tif")
+ }
+ else if (filenameOrURL.toLowerCase().endsWith(".tif")
||
filenameOrURL.toLowerCase().endsWith(".tiff")) {
-
- GeoReferencedRaster geoRaster;
-
- 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.getData(rectangle)
- .getSampleDouble(col, row, band);
-
-
+ return TiffUtils.getRenderedOp(new
File(filenameOrURL)).getAsBufferedImage(subset, null).getData();
+
} else if (filenameOrURL.toLowerCase().endsWith(".jpg")) {
// PlanarImage pimage;
@@ -395,19 +381,11 @@
} 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);
- }
- if (renderedOp != null) {
- return new Point(renderedOp.getWidth(),
renderedOp.getHeight());
- }
-
+ renderedOp= TiffUtils.getRenderedOp(new
File(filenameOrURL));
+
+ return renderedOp.getData(rectangle)
+ .getSampleDouble(col, row, band);
+
} 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
