[Raster-commits] r434 - pkg/raster/R

[noreply at r-forge.r-project.org]

Author: rhijmans
Date: 2009-04-28 03:30:08 +0200 (Tue, 28 Apr 2009)
New Revision: 434

Modified:
   pkg/raster/R/aggregate.R
   pkg/raster/R/roundCoords.R
Log:


Modified: pkg/raster/R/aggregate.R
===================================================================
--- pkg/raster/R/aggregate.R	2009-04-27 03:58:22 UTC (rev 433)
+++ pkg/raster/R/aggregate.R	2009-04-28 01:30:08 UTC (rev 434)
@@ -81,8 +81,8 @@
 		}
 		if (!canProcessInMemory(x, 2) && filename == '') {
 			filename <- tempfile()
-			filename(outraster) <- filename
-			if (options('verbose')[[1]]) { cat('writing raster to:', filename(raster))	}						
+			filename(outRaster) <- filename
+			if (options('verbose')[[1]]) { cat('writing raster to:', filename(outRaster))	}						
 		}
 		starttime <- proc.time()
 		v <- vector(length=0)

Modified: pkg/raster/R/roundCoords.R
===================================================================
--- pkg/raster/R/roundCoords.R	2009-04-27 03:58:22 UTC (rev 433)
+++ pkg/raster/R/roundCoords.R	2009-04-28 01:30:08 UTC (rev 434)
@@ -25,6 +25,9 @@
 	b at ymin <- floor(b at ymin)
 	b at xmax <- ceiling(b at xmax)
 	b at ymax <- ceiling(b at ymax)
+	if (class(object) == 'BoundingBox') {
+		return(b)
+	}
 	object <- setExtent(object, b)
 	return(object)
 }