Skip to content

Commit

Permalink
Don't constrain GridBounds size to IntMax x IntMax
Browse files Browse the repository at this point in the history
  • Loading branch information
fosskers committed Jul 20, 2017
1 parent 5c68d45 commit 1a886a0
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions raster/src/main/scala/geotrellis/raster/GridBounds.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package geotrellis.raster

import scala.collection.mutable
import spire.syntax.cfor._

/**
* The companion object for the [[GridBounds]] type.
Expand Down Expand Up @@ -75,8 +74,7 @@ object GridBounds {
case class GridBounds(colMin: Int, rowMin: Int, colMax: Int, rowMax: Int) {
def width = colMax - colMin + 1
def height = rowMax - rowMin + 1
if(width.toLong * height.toLong > Int.MaxValue) { sys.error(s"Cannot construct grid bounds of this size: $width x $height") }
def size = width * height
def size: Long = width.toLong * height.toLong
def isEmpty = size == 0

/**
Expand Down Expand Up @@ -160,16 +158,10 @@ case class GridBounds(colMin: Int, rowMin: Int, colMax: Int, rowMax: Int) {
/**
* Return the coordinates covered by the present [[GridBounds]].
*/
def coords: Array[(Int, Int)] = {
val arr = Array.ofDim[(Int, Int)](width*height)
cfor(0)(_ < height, _ + 1) { row =>
cfor(0)(_ < width, _ + 1) { col =>
arr(row * width + col) =
(col + colMin, row + rowMin)
}
}
arr
}
def coords: Stream[(Int, Int)] = for {
row <- Stream.range(0, height)
col <- Stream.range(0, width)
} yield (row, col)

/**
* Return the intersection of the present [[GridBounds]] and the
Expand Down

0 comments on commit 1a886a0

Please sign in to comment.