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

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

Author: rhijmans
Date: 2009-04-20 17:36:34 +0200 (Mon, 20 Apr 2009)
New Revision: 422

Modified:
   pkg/raster/R/Merge.R
   pkg/raster/R/hist.R
Log:


Modified: pkg/raster/R/Merge.R
===================================================================
--- pkg/raster/R/Merge.R	2009-04-20 11:28:52 UTC (rev 421)
+++ pkg/raster/R/Merge.R	2009-04-20 15:36:34 UTC (rev 422)
@@ -26,7 +26,7 @@
 #	bndbox <- newBbox(bb[1,1], bb[1,2], bb[2,1], bb[2,2])
 	outraster <- setExtent(outraster, bb, keepres=TRUE, snap=FALSE)
 
-	isint <- TRUE
+	isInt <- TRUE
 	for (i in 1:length(rasters)) {
 		dtype <- .shortDataType(rasters[[i]]@file at datanotation)
 		if (dtype != 'INT') {

Modified: pkg/raster/R/hist.R
===================================================================
--- pkg/raster/R/hist.R	2009-04-20 11:28:52 UTC (rev 421)
+++ pkg/raster/R/hist.R	2009-04-20 15:36:34 UTC (rev 422)
@@ -12,7 +12,7 @@
 )
 
 setMethod('hist', signature(x='Raster'), 
-	function(x, maxsamp=100000, ...){
+	function(x, maxsamp=10000, ...){
 		if (dataContent(x) != 'all') {
 			if (dataSource(x) == 'disk') {
 		# TO DO: make a function that does this by block and combines  all data into a single histogram