Moved widening bit math into companion of WideIntNoData.

Signed-off-by: Simeon H.K. fitch <fitch@astraea.io>
locationtech · Apr 28, 2017 · c7bdf73 · c7bdf73
1 parent 64a76a9
commit c7bdf73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/raster/src/main/scala/geotrellis/raster/CellType.scala b/raster/src/main/scala/geotrellis/raster/CellType.scala
@@ -351,7 +351,7 @@ case object UByteConstantNoDataCellType
     extends UByteCells with ConstantNoData
 case class UByteUserDefinedNoDataCellType(noDataValue: Byte)
     extends UByteCells with UserDefinedNoData[Byte] {
-  override def widenedNoData(implicit ev: Numeric[Byte]) = WideIntNoData(noDataValue & 0xFF)
+  override def widenedNoData(implicit ev: Numeric[Byte]) = WideIntNoData(noDataValue)
 }
 
 case object ShortCellType
@@ -367,7 +367,7 @@ case object UShortConstantNoDataCellType
     extends UShortCells with ConstantNoData
 case class UShortUserDefinedNoDataCellType(noDataValue: Short)
     extends UShortCells with UserDefinedNoData[Short] {
-  override def widenedNoData(implicit ev: Numeric[Short]) = WideIntNoData(noDataValue & 0xFFFF)
+  override def widenedNoData(implicit ev: Numeric[Short]) = WideIntNoData(noDataValue)
 }
 
 case object IntCellType

diff --git a/raster/src/main/scala/geotrellis/raster/CellTypeEncoding.scala b/raster/src/main/scala/geotrellis/raster/CellTypeEncoding.scala
@@ -76,7 +76,7 @@ sealed trait UserDefinedNoDataEncoding extends CellTypeEncoding { self ⇒
       val number = text.replace(name, "")
 
       if(isFloatingPoint) Try(number.toDouble).map(WideDoubleNoData).toOption
-      else Try(number.toInt).map(WideIntNoData).toOption
+      else Try(number.toInt).map(WideIntNoData.apply).toOption
     }
     else None
   }
@@ -100,6 +100,10 @@ sealed trait WidenedNoData {
 case class WideIntNoData(asInt: Int) extends WidenedNoData {
   def asDouble = asInt.toDouble
 }
+object WideIntNoData {
+  def apply(thinned: Byte) = new WideIntNoData(thinned & 0xFF)
+  def apply(thinned: Short) = new WideIntNoData(thinned & 0xFFFF)
+}
 
 /** NoData stored as a Double */
 case class WideDoubleNoData(asDouble: Double) extends WidenedNoData {