Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/image.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoumith Chintala <soumith@gmail.com>2016-07-31 06:26:45 +0300
committerSoumith Chintala <soumith@gmail.com>2016-07-31 06:26:45 +0300
commit797fcb101b76c9b329b3ee83349b0f6adeacac94 (patch)
treef20cdebecea13b37deee9131a9a75dcc085d89b0
parentf319cc59dc3e018b1b18031f0aa477cca95a4d03 (diff)
removing lena, adding grace hopper
-rw-r--r--assets/grace_hopper_512.jpgbin0 -> 65544 bytes
-rw-r--r--assets/grace_hopper_512.pngbin0 -> 431614 bytes
-rw-r--r--assets/lena.jpgbin303179 -> 0 bytes
-rw-r--r--assets/lena.pngbin453965 -> 0 bytes
-rw-r--r--init.lua2
-rw-r--r--test/test.lua6
6 files changed, 4 insertions, 4 deletions
diff --git a/assets/grace_hopper_512.jpg b/assets/grace_hopper_512.jpg
new file mode 100644
index 0000000..6026020
--- /dev/null
+++ b/assets/grace_hopper_512.jpg
Binary files differ
diff --git a/assets/grace_hopper_512.png b/assets/grace_hopper_512.png
new file mode 100644
index 0000000..f0cb7cd
--- /dev/null
+++ b/assets/grace_hopper_512.png
Binary files differ
diff --git a/assets/lena.jpg b/assets/lena.jpg
deleted file mode 100644
index 2fd59ba..0000000
--- a/assets/lena.jpg
+++ /dev/null
Binary files differ
diff --git a/assets/lena.png b/assets/lena.png
deleted file mode 100644
index c808105..0000000
--- a/assets/lena.png
+++ /dev/null
Binary files differ
diff --git a/init.lua b/init.lua
index e1bfe63..5f4b9ed 100644
--- a/init.lua
+++ b/init.lua
@@ -1485,7 +1485,7 @@ rawset(image, 'window', window)
-- lena is always useful
--
local function lena()
- local fname = 'lena'
+ local fname = 'grace_hopper_512'
if xlua.require 'libjpeg' then
lena = image.load(paths.concat(fpath(), 'assets', fname .. '.jpg'), 3)
elseif xlua.require 'libpng' then
diff --git a/test/test.lua b/test/test.lua
index a5ca949..80299e9 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -327,7 +327,7 @@ end
--
function test.CompareLoadAndDecompress()
-- This test breaks if someone removes lena from the repo
- local imfile = getTestImagePath('lena.jpg')
+ local imfile = getTestImagePath('grace_hopper_512.jpg')
if not paths.filep(imfile) then
error(imfile .. ' is missing!')
end
@@ -465,7 +465,7 @@ end
local function testByteTensorRoundtrip(forward, backward, cond, msg)
local lena = toByteImage(image.lena())
local expected = lena
- local actual = backward(forward(expected))
+ local actual = backward(forward(expected))
assertByteTensorEq(actual, expected, cond, msg)
end
@@ -480,7 +480,7 @@ end
function test.rgb2hsvByteTensor()
testFunctionOnByteTensor(image.rgb2hsv, 'image.rgb2hsv error for ByteTensor')
testFunctionOnByteTensor(image.hsv2rgb, 'image.hsv2rgb error for ByteTensor')
- testByteTensorRoundtrip(image.rgb2hsv, image.hsv2rgb, 2,
+ testByteTensorRoundtrip(image.rgb2hsv, image.hsv2rgb, 3,
'image.rgb2hsv roundtrip error for ByteTensor')
end