diff options
author | Jonathan Tompson <jonathantompson@gmail.com> | 2014-10-17 22:33:12 +0400 |
---|---|---|
committer | Jonathan Tompson <jonathantompson@gmail.com> | 2014-10-17 22:33:12 +0400 |
commit | 7406a5f87ca86a3cdc09cfbb1037ce1ec555ee90 (patch) | |
tree | 158773ade06fd3591dcdf400e719eaf0cd00ffdf | |
parent | 9e9dfbc38f8395d14f4d347e737c4a68b69536c0 (diff) |
fix depth opt arg in totensor
-rw-r--r-- | generic/qttorch.cpp | 2 | ||||
-rw-r--r-- | init.lua | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/qttorch.cpp b/generic/qttorch.cpp index 0ff66e7..2968b0f 100644 --- a/generic/qttorch.cpp +++ b/generic/qttorch.cpp @@ -105,7 +105,7 @@ static int qttorch_(qimage_totensor)(lua_State *L) } else { - depth = luaL_optinteger(L, 2, 3); + depth = luaL_optinteger(L, 4, 3); if (depth != 1 && depth != 3 && depth != 4) luaL_error(L, "depth must be 1, 3, or 4."); if (depth == 1) @@ -6,11 +6,11 @@ qt.QImage.fromTensor = function(tensor, scale) return tensor.qttorch.QImageFromTensor(tensor, scale) end -qt.QImage.toTensor = function(self, tensor, scale) +qt.QImage.toTensor = function(self, tensor, scale, depth) if type(tensor) == 'userdata' then - return tensor.qttorch.QImageToTensor(self, tensor, scale) + return tensor.qttorch.QImageToTensor(self, tensor, scale, depth) else local t = torch.getmetatable(torch.getdefaulttensortype()) - return t.qttorch.QImageToTensor(self, tensor, scale) + return t.qttorch.QImageToTensor(self, tensor, scale, depth) end end |