Fix incorrect image tensor shape

akash-akya · Oct 15, 2023 · 96668db · 96668db
1 parent cd98ba2
commit 96668db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/vix/tensor.ex b/lib/vix/tensor.ex
@@ -29,7 +29,7 @@ defmodule Vix.Tensor do
   @typedoc """
   Struct to hold raw pixel data returned by the Libvips along with metadata about the binary.
 
-  `:names` will always be `[:width, :height, :bands]`
+  `:names` will always be `[:height, :width, :bands]`
   """
 
   @type t() :: %__MODULE__{
@@ -41,7 +41,7 @@ defmodule Vix.Tensor do
 
   defstruct data: nil,
             shape: {0, 0, 0},
-            names: [:width, :height, :bands],
+            names: [:height, :width, :bands],
             type: {}
 
   @doc """

diff --git a/lib/vix/vips/image.ex b/lib/vix/vips/image.ex
@@ -679,8 +679,8 @@ defmodule Vix.Vips.Image do
     with {:ok, binary} <- write_to_binary(image) do
       tensor = %Vix.Tensor{
         data: binary,
-        shape: {width(image), height(image), bands(image)},
-        names: [:width, :height, :bands],
+        shape: {height(image), width(image), bands(image)},
+        names: [:height, :width, :bands],
         type: Vix.Tensor.type(image)
       }
 

diff --git a/lib/vix/vips/mutable_image.ex b/lib/vix/vips/mutable_image.ex
@@ -85,7 +85,7 @@ defmodule Vix.Vips.MutableImage do
   end
 
   @doc """
-  Return the shape of the umage as
+  Return the shape of the image as
   `{width, height, bands}`.
   """
   def shape(%MutableImage{pid: pid}) do

diff --git a/test/vix/vips/image_test.exs b/test/vix/vips/image_test.exs
@@ -301,7 +301,7 @@ defmodule Vix.Vips.ImageTest do
     {:ok, im} = Image.new_from_file(img_path("black.jpg"))
     assert {:ok, %Vix.Tensor{} = tensor} = Image.write_to_tensor(im)
 
-    assert tensor.shape == {Image.width(im), Image.height(im), Image.bands(im)}
+    assert tensor.shape == {Image.height(im), Image.width(im), Image.bands(im)}
 
     expected_bin_size = Image.width(im) * Image.height(im) * Image.bands(im)
     assert tensor.data == :binary.copy(<<0>>, expected_bin_size)