Merge branch 'main' into single-line-lib-definitions

Author: snacks02

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
       - run: >
           apk add
           crystal
+          git-lfs
           libjpeg-turbo
           libjpeg-turbo-dev
           libspng

README.md

@@ -2,11 +2,11 @@
   <picture>
     <source
       media="(prefers-color-scheme: dark)"
-      srcset="https://raw.githubusercontent.com/phenopolis/pluto-logo/main/logo-white.png"
+      srcset="https://media.githubusercontent.com/media/phenopolis/pluto/media/logo-white.png"
     />
     <img
       alt="logo"
-      src="https://raw.githubusercontent.com/phenopolis/pluto-logo/main/logo-black.png"
+      src="https://media.githubusercontent.com/media/phenopolis/pluto/media/logo-black.png"
       width="720px"
     />
   </picture>

shard.yml

@@ -4,13 +4,15 @@ version: 1.0.1
 dependencies:
   stumpy_core:
     github: stumpycr/stumpy_core
+    version: ~> 1.9
 
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
     version: ~> 1.6.1
   pluto_samples:
-    github: phenopolis/pluto-samples
+    github: phenopolis/pluto
+    branch: samples
   stumpy_png:
     github: stumpycr/stumpy_png
 

spec/pluto/operation/crop_spec.cr

@@ -5,15 +5,15 @@ describe Pluto::Operation::Crop do
     it "checks image width boundaries" do
       image = ga_sample
 
-      expect_raises(Exception, "Crop dimensions extend 1 pixels beyond width of the image (640)") do
+      expect_raises(Pluto::Exception, "Crop dimensions extend 1 pixels beyond width of the image (640)") do
         image.crop(0, 0, image.width + 1, image.height)
       end
     end
 
     it "checks image height boundaries" do
       image = ga_sample
 
-      expect_raises(Exception, "Crop dimensions extend 1 pixels beyond height of the image (480)") do
+      expect_raises(Pluto::Exception, "Crop dimensions extend 1 pixels beyond height of the image (480)") do
         image.crop(0, 0, image.width, image.height + 1)
       end
     end

spec/pluto/operation/horizontal_blur_spec.cr

@@ -19,14 +19,14 @@ describe Pluto::Operation::HorizontalBlur do
     end
 
     it "doesn't cause arithmetic overload" do
-      with_sample("problem_images/28_arithmetic_overflow_in_blur.jpeg") do |io|
+      with_sample("problematic_images/28_arithmetic_overflow_in_blur.jpeg") do |io|
         image = Pluto::ImageRGBA.from_jpeg(io)
         expect_digest image.horizontal_blur(10), "d1e2b9363a2e7a36e738599cda8dab844a828b15"
       end
     end
 
     it "doesn't cause arithmetic overload again" do
-      with_sample("problem_images/46_arithmetic_overflow_in_blur_again.jpeg") do |io|
+      with_sample("problematic_images/46_arithmetic_overflow_in_blur_again.jpeg") do |io|
         image = Pluto::ImageRGBA.from_jpeg(io)
         expect_digest image.horizontal_blur(5), "a6ce6aeb78bc3cc6cff8e39f932b3e778b127950"
       end

spec/pluto/operation/rotation_spec.cr

@@ -5,7 +5,7 @@ describe Pluto::Operation::Rotation do
     it "checks padding and radius" do
       image = ga_sample
 
-      expect_raises(Exception, "Can't pad image and limit rotation by radius") do
+      expect_raises(Pluto::Exception, "Can't pad image and limit rotation by radius") do
         image.rotation(0, padding: true, radius: 1)
       end
     end

spec/pluto/operation/vertical_blur_spec.cr

@@ -19,7 +19,7 @@ describe Pluto::Operation::VerticalBlur do
     end
 
     it "doesn't cause arithmetic overload" do
-      with_sample("problem_images/28_arithmetic_overflow_in_blur.jpeg") do |io|
+      with_sample("problematic_images/28_arithmetic_overflow_in_blur.jpeg") do |io|
         image = Pluto::ImageRGBA.from_jpeg(io)
         expect_digest image.vertical_blur(10), "00e2c8a20e4554242bca3e0acf841028a2922fe6"
       end

src/pluto/format/jpeg.cr

@@ -50,7 +50,7 @@ module Pluto::Format::JPEG
       message = String.new(Format::Binding::LibJPEGTurbo.get_error_str(handle))
       error_code = Format::Binding::LibJPEGTurbo.get_error_code(handle).to_i
 
-      raise ::Pluto::Exception.new(message, error_code) unless code == 0
+      raise Exception.new(message, error_code) unless code == 0
     end
   end
 

src/pluto/format/png.cr

@@ -4,7 +4,7 @@ module Pluto::Format::PNG
   macro included
     def self.from_png(image_data : Bytes) : self
       ctx = Format::Binding::LibSPNG.ctx_new(Format::Binding::LibSPNG::CtxFlags::None)
-      raise ::Pluto::Exception.new("Failed to create a context") unless ctx
+      raise Exception.new("Failed to create a context") unless ctx
 
       Format::Binding::LibSPNG.set_png_buffer(ctx, image_data, image_data.size)
 
@@ -47,7 +47,7 @@ module Pluto::Format::PNG
     end
 
     protected def self.check_png(code)
-      raise ::Pluto::Exception.new(code) if code != 0
+      raise Exception.new(code) if code != 0
     end
   end
 
@@ -61,7 +61,7 @@ module Pluto::Format::PNG
     end
 
     ctx = Format::Binding::LibSPNG.ctx_new(Format::Binding::LibSPNG::CtxFlags::Encoder)
-    raise ::Pluto::Exception.new("Failed to create a context") unless ctx
+    raise Exception.new("Failed to create a context") unless ctx
 
     Format::Binding::LibSPNG.set_option(ctx, Format::Binding::LibSPNG::Option::EncodeToBuffer, true)
     Format::Binding::LibSPNG.set_png_buffer(ctx, image_data.buffer, image_data.size)
@@ -83,7 +83,7 @@ module Pluto::Format::PNG
     check_png error
 
     buffer = Format::Binding::LibSPNG.get_png_buffer(ctx, out size, pointerof(error))
-    raise ::Pluto::Exception.new("Failed to get a buffer") unless ctx
+    raise Exception.new("Failed to get a buffer") unless ctx
 
     bytes = Bytes.new(buffer, size)
     io.write(bytes)

src/pluto/format/ppm.cr

@@ -25,13 +25,13 @@ module Pluto::Format::PPM
             green.unsafe_put(index, green_byte)
             blue.unsafe_put(index, blue_byte)
           else
-            raise "The image ends prematurely"
+            raise Exception.new("The image ends prematurely")
           end
         end
 
         new(red, green, blue, alpha, width, height)
       else
-        raise "The image doesn't have width or height"
+        raise Exception.new("The image doesn't have width or height")
       end
     end
   end

src/pluto/format/webp.cr

@@ -34,7 +34,7 @@ module Pluto::Format::WebP
     end
 
     protected def self.check_webp(code)
-      raise ::Pluto::Exception.new(code.to_i) if code == 0
+      raise Exception.new(code.to_i) if code == 0
     end
   end
 

src/pluto/image_ga.cr

@@ -51,15 +51,15 @@ class Pluto::ImageGA < Pluto::Image
     case channel_type
     when ChannelType::Gray  then @gray
     when ChannelType::Alpha then @alpha
-    else                         raise "Unknown channel type #{channel_type} for ImageRGBA"
+    else                         raise Exception.new("Unknown channel type #{channel_type} for ImageRGBA")
     end
   end
 
   def []=(channel_type : ChannelType, channel : Array(UInt8)) : Array(UInt8)
     case channel_type
     when ChannelType::Gray  then self.gray = channel
     when ChannelType::Alpha then self.alpha = channel
-    else                         raise "Unknown channel type #{channel_type} for ImageGA"
+    else                         raise Exception.new("Unknown channel type #{channel_type} for ImageGA")
     end
   end
 

src/pluto/image_rgba.cr

@@ -36,7 +36,7 @@ class Pluto::ImageRGBA < Pluto::Image
     when ChannelType::Green then @green
     when ChannelType::Blue  then @blue
     when ChannelType::Alpha then @alpha
-    else                         raise "Unknown channel type #{channel_type} for ImageRGBA"
+    else                         raise Exception.new("Unknown channel type #{channel_type} for ImageRGBA")
     end
   end
 
@@ -46,7 +46,7 @@ class Pluto::ImageRGBA < Pluto::Image
     when ChannelType::Green then @green = channel
     when ChannelType::Blue  then @blue = channel
     when ChannelType::Alpha then @alpha = channel
-    else                         raise "Unknown channel type #{channel_type} for ImageRGBA"
+    else                         raise Exception.new("Unknown channel type #{channel_type} for ImageRGBA")
     end
   end
 

src/pluto/operation/crop.cr

@@ -4,8 +4,8 @@ module Pluto::Operation::Crop
   end
 
   def crop!(x : Int32, y : Int32, new_width : Int32, new_height : Int32) : self
-    raise "Crop dimensions extend #{x + new_width - width} pixels beyond width of the image (#{width})" if (x + new_width) > width
-    raise "Crop dimensions extend #{y + new_height - height} pixels beyond height of the image (#{height})" if (y + new_height) > height
+    raise Exception.new("Crop dimensions extend #{x + new_width - width} pixels beyond width of the image (#{width})") if (x + new_width) > width
+    raise Exception.new("Crop dimensions extend #{y + new_height - height} pixels beyond height of the image (#{height})") if (y + new_height) > height
 
     new_size = new_width * new_height
     height_offset = y * width