From 3fb733b53cb07188827246afbe23c78177c2a1cf Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 13 Feb 2009 10:16:58 -0600
Subject: [PATCH] add 48bpp mode to tiff

---
 basis/images/images.factor    | 10 +---------
 basis/images/tiff/tiff.factor |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/basis/images/images.factor b/basis/images/images.factor
index e8f5530706..41d96a673b 100644
--- a/basis/images/images.factor
+++ b/basis/images/images.factor
@@ -5,7 +5,7 @@ math specialized-arrays.direct.uint byte-arrays ;
 IN: images
 
 SINGLETONS: BGR RGB BGRA RGBA ABGR ARGB RGBX XRGB BGRX XBGR
-32R32G32B ;
+16R16G16B 32R32G32B ;
 
 TUPLE: image dim component-order byte-order bitmap ;
 
@@ -17,14 +17,6 @@ GENERIC: load-image* ( path tuple -- image )
     dup component-order>>
     {
         { RGBA [ ] }
-        { 32R32G32B [
-            [
-                ! >byte-array
-                ! dup length 4 /i <direct-uint-array> [ 32 2^ /i ] map
-                ! >byte-array
-                ! 4 <sliced-groups> le> [ 32 2^ /i ] map concat
-            ] change-bitmap
-        ] }
         { BGRA [
             [
                 4 <sliced-groups> dup [ [ 0 3 ] dip <slice> reverse-here ] each
diff --git a/basis/images/tiff/tiff.factor b/basis/images/tiff/tiff.factor
index baac3a2dfb..28eee7d98a 100755
--- a/basis/images/tiff/tiff.factor
+++ b/basis/images/tiff/tiff.factor
@@ -278,6 +278,7 @@ ERROR: unknown-component-order ifd ;
 : ifd-component-order ( ifd -- byte-order )
     bits-per-sample find-tag {
         { { 32 32 32 } [ 32R32G32B ] }
+        { { 16 16 16 } [ 16R16G16B ] }
         { { 8 8 8 8 } [ RGBA ] }
         { { 8 8 8 } [ RGB ] }
         [ unknown-component-order ]