Revision 1074

View differences:

org.gvsig.raster.netcdf/trunk/org.gvsig.raster.netcdf/org.gvsig.raster.netcdf.io/src/main/java/org/gvsig/raster/netcdf/io/NetCDFProvider.java
75 75 
 *
76 76 
 * @author Nacho Brodin (nachobrodin@gmail.com)
77 77 
 */
78 
@SuppressWarnings("deprecation")
78 79 
public class NetCDFProvider extends DefaultRasterProvider {
79 80 
	public static String                     NAME                     = "NetCDF Raster";
80 81 
	public static String                     DESCRIPTION              = "NetCDF Raster file";
......
610 611 
		}
611 612 
		if(resampling) {
612 613 
			try {
613 
				return buf.getAdjustedWindow(rasterBuf.getWidth(), rasterBuf.getHeight(), Buffer.INTERPOLATION_NearestNeighbour);
614 
				Buffer result = null;
615 
				result = buf.getAdjustedWindow(rasterBuf.getWidth(), rasterBuf.getHeight(), Buffer.INTERPOLATION_NearestNeighbour);
616 
				if(result != buf)
617 
					buf.dispose();
618 
				return result;
614 619 
			} catch (ProcessInterruptedException e) {
615 620 
				return buf;
616 621 
			}
......
655 660 
		Point2D lr = new Point2D.Double(viewRequest.getLRX(), viewRequest.getLRY());
656 661 
		ul = worldToRaster(ul);
657 662 
		lr = worldToRaster(lr);
658 
		ul.setLocation(ul.getX() < 0 ? 1 : ul.getX(), ul.getY() < 0 ? 1 : ul.getY());
659 
		lr.setLocation(lr.getX() < 0 ? 1 : lr.getX(), lr.getY() < 0 ? 1 : lr.getY());
663 
		ul.setLocation(ul.getX() < 0 ? 0 : ul.getX(), ul.getY() < 0 ? 0 : ul.getY());
664 
		lr.setLocation(lr.getX() < 0 ? 0 : lr.getX(), lr.getY() < 0 ? 0 : lr.getY());
665 
		ul.setLocation(ul.getX() >= getWidth() ? getWidth() - 1 : ul.getX(), ul.getY() >= getHeight() ? getHeight() - 1 : ul.getY());
666 
		lr.setLocation(lr.getX() >= getWidth() ? getWidth() - 1 : lr.getX(), lr.getY() >= getHeight() ? getHeight() - 1 : lr.getY());
660 667
661 668 
		adjustPoints(ul, lr);
662 669

Also available in: Unified diff