Revision: 6526
http://sourceforge.net/p/jump-pilot/code/6526
Author: edso
Date: 2020-09-23 16:22:46 +0000 (Wed, 23 Sep 2020)
Log Message:
-----------
rename getImage() to getRenderedOp() because it's what it does
keep getImage() deprecated for now
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoRaster.java
core/trunk/src/org/openjump/core/rasterimage/TiffUtilsV2.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoRaster.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoRaster.java
2020-09-23 16:20:40 UTC (rev 6525)
+++
core/trunk/src/com/vividsolutions/jump/workbench/imagery/geoimg/GeoRaster.java
2020-09-23 16:22:46 UTC (rev 6526)
@@ -279,7 +279,12 @@
protected void normalize(RenderedOp image) {
}
+ @Deprecated // use getRenderedOP() instead
public RenderedOp getImage() throws ReferencedImageException {
+ return getRenderedOp();
+ }
+
+ public RenderedOp getRenderedOp() throws ReferencedImageException {
if (src == null)
readRasterfile();
return src;
Modified: core/trunk/src/org/openjump/core/rasterimage/TiffUtilsV2.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/TiffUtilsV2.java
2020-09-23 16:20:40 UTC (rev 6525)
+++ core/trunk/src/org/openjump/core/rasterimage/TiffUtilsV2.java
2020-09-23 16:22:46 UTC (rev 6526)
@@ -42,13 +42,12 @@
// a File -> RenderedOp cache mapping to prevent recreating inputs for the
same file
private static HashMap<File,GeoReferencedRaster> geoRasterCache = new
HashMap<File,GeoReferencedRaster>();
-
public static RenderedOp getRenderedOp(File tiffFile) throws IOException {
GeoReferencedRaster geoRaster = getGeoReferencedRaster(tiffFile);
RenderedOp rop;
try {
- rop = geoRaster.getImage();
- } catch (ReferencedImageException e) {
+ rop = geoRaster.getRenderedOp();
+ } catch (Exception e) {
// TODO: handle errors better, wrapping it in IOException here
// because that's what's handled up from here
throw new IOException(e);
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
