Merge pull request #65 from torch/jpegperf

fixing y2jet for other default tensor types

1 files changed, 5 insertions, 4 deletions

diff --git a/init.lua b/init.lua
index d204d1e..4cccfdf 100755
--- a/init.lua
+++ b/init.lua
@@ -1748,18 +1748,19 @@ function image.y2jet(...)
 
    -- accept 3D grayscale
    if input:dim() == 3 and input:size(1) == 1 then
-      input = torch.Tensor(input):resize(input:size(2), input:size(3))
+      input = input.new(input):resize(input:size(2), input:size(3))
    end
 
    -- accept 1D greyscale
    if input:dim() == 1  then
-      input = torch.Tensor(input):resize(1, input:size(1))
+      input = input.new(input):resize(1, input:size(1))
    end
 
-   local output = output or torch.Tensor():typeAs(input)
+   local output = output or input.new()
    local L = input:max()
 
-   input.image.colorize(output, input-1, image.jetColormap(L))
+   local colorMap = image.jetColormap(L):typeAs(input)
+   input.image.colorize(output, input-1, colorMap)
 
    return output
 end