JuliaImages
diff --git a/‎AsciiPixel/Project.toml‎
Lines changed: 1 addition & 2 deletions b/‎AsciiPixel/Project.toml‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎AsciiPixel/src/ascii.jl‎
Lines changed: 0 additions & 4 deletions b/‎AsciiPixel/src/ascii.jl‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎Project.toml‎
Lines changed: 1 addition & 3 deletions b/‎Project.toml‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/ImageInTerminal.jl‎
Lines changed: 1 addition & 2 deletions b/‎src/ImageInTerminal.jl‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/deprecated.jl‎
Lines changed: 0 additions & 21 deletions b/‎src/deprecated.jl‎
Lines changed: 0 additions & 21 deletions
diff --git a/‎…st/reference/mandril_big_imshow24bit.txt‎ ‎test/reference/mandril_big_24bit.txt‎test/reference/mandril_big_imshow24bit.txt renamed to test/reference/mandril_big_24bit.txt b/‎…st/reference/mandril_big_imshow24bit.txt‎ ‎test/reference/mandril_big_24bit.txt‎test/reference/mandril_big_imshow24bit.txt renamed to test/reference/mandril_big_24bit.txt
diff --git a/‎test/reference/mandril_big_imshow.txt‎ ‎test/reference/mandril_big_8bit.txt‎test/reference/mandril_big_imshow.txt renamed to test/reference/mandril_big_8bit.txt b/‎test/reference/mandril_big_imshow.txt‎ ‎test/reference/mandril_big_8bit.txt‎test/reference/mandril_big_imshow.txt renamed to test/reference/mandril_big_8bit.txt
diff --git a/‎test/reference/mandril_big_imshow256.txt‎
Lines changed: 0 additions & 10 deletions b/‎test/reference/mandril_big_imshow256.txt‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎…/reference/mandril_small_imshow24bit.txt‎ ‎test/reference/mandril_small_24bit.txt‎test/reference/mandril_small_imshow24bit.txt renamed to test/reference/mandril_small_24bit.txt b/‎…/reference/mandril_small_imshow24bit.txt‎ ‎test/reference/mandril_small_24bit.txt‎test/reference/mandril_small_imshow24bit.txt renamed to test/reference/mandril_small_24bit.txt
diff --git a/‎test/reference/mandril_small_imshow.txt‎ ‎test/reference/mandril_small_8bit.txt‎test/reference/mandril_small_imshow.txt renamed to test/reference/mandril_small_8bit.txt b/‎test/reference/mandril_small_imshow.txt‎ ‎test/reference/mandril_small_8bit.txt‎test/reference/mandril_small_imshow.txt renamed to test/reference/mandril_small_8bit.txt
@@ -13,12 +13,11 @@ julia = "1.6"
 
 [extras]
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
-ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 ImageTransformations = "02fcd773-0e25-5acc-982a-7f6622650795"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
 
 [targets]
-test = ["ImageIO", "ImageMagick", "ImageTransformations", "OffsetArrays", "ReferenceTests", "Test", "TestImages"]
+test = ["ImageIO", "ImageTransformations", "OffsetArrays", "ReferenceTests", "Test", "TestImages"]
@@ -104,11 +104,7 @@ function ascii_encode(
             else
                 # if reached it means that the last character row
                 # has only the upper pixel defined.
-<<<<<<< HEAD
                 nothing
-=======
-                :nothing
->>>>>>> fcd1f5f (rename ascii_encode -> ascii_display when using io, rework downscale)
             end
             _printc(io, Crayon(foreground=fgcol, background=bgcol), "▀")
         end
 
@@ -23,9 +23,7 @@ julia = "1.6"
 
 [extras]
 CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
-ImageBase = "c817782e-172a-44cc-b673-b171935fbb9e"
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
-ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 ImageQualityIndexes = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9"
 ImageTransformations = "02fcd773-0e25-5acc-982a-7f6622650795"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
@@ -37,4 +35,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
 
 [targets]
-test = ["CoordinateTransformations", "ImageBase", "ImageIO", "ImageMagick", "ImageQualityIndexes", "ImageTransformations", "OffsetArrays", "Pkg", "ReferenceTests", "Rotations", "SparseArrays", "Test", "TestImages"]
+test = ["CoordinateTransformations", "ImageIO", "ImageQualityIndexes", "ImageTransformations", "OffsetArrays", "Pkg", "ReferenceTests", "Rotations", "SparseArrays", "Test", "TestImages"]
@@ -6,6 +6,7 @@ using ImageBase: restrict
 using ColorTypes
 using Requires
 using Crayons
+using FileIO
 
 # -------------------------------------------------------------------
 # overload default show in the REPL for colorant (arrays)
@@ -123,8 +124,6 @@ imshow(img, args...) = throw(
     ArgumentError("imshow only supports colorant arrays with 1 or 2 dimensions")
 )
 
-include("deprecated.jl")
-
 function __init__()
     enable_encoding()