oil 0.2.1 → 0.3.0

data/ext/oil/png.c

@@ -50,19 +50,33 @@ static void write_data_fn(png_structp png_ptr, png_bytep data, png_size_t length
 
 /* Ruby GC */
 
-static void deallocate(struct readerdata *reader)
+static void deallocate(void *ptr)
 {
+	struct readerdata *reader = ptr;
 	png_destroy_read_struct(&reader->png, &reader->info, NULL);
 	free(reader);
 }
 
-static void mark(struct readerdata *reader)
+static void mark(void *ptr)
 {
+	struct readerdata *reader = ptr;
 	if (!NIL_P(reader->source_io)) {
 		rb_gc_mark(reader->source_io);
 	}
 }
 
+static size_t memsize(const void *ptr)
+{
+	return sizeof(struct readerdata);
+}
+
+static const rb_data_type_t png_reader_type = {
+	"Oil::PNGReader",
+	{ mark, deallocate, memsize },
+	0, 0,
+	RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 static void allocate2(struct readerdata *reader)
 {
 	reader->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, (png_error_ptr)error, (png_error_ptr)warning);
@@ -74,7 +88,7 @@ static VALUE allocate(VALUE klass)
 	struct readerdata *reader;
 	VALUE self;
 
-	self = Data_Make_Struct(klass, struct readerdata, mark, deallocate, reader);
+	self = TypedData_Make_Struct(klass, struct readerdata, &png_reader_type, reader);
 	allocate2(reader);
 	return self;
 }
@@ -92,7 +106,7 @@ static VALUE initialize(VALUE self, VALUE io)
 {
 	struct readerdata *reader;
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 
 	if (reader->info) {
 		png_destroy_read_struct(&reader->png, &reader->info, NULL);
@@ -124,7 +138,7 @@ static VALUE initialize(VALUE self, VALUE io)
 static VALUE width(VALUE self)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	return INT2FIX(png_get_image_width(reader->png, reader->info));
 }
 
@@ -138,7 +152,7 @@ static VALUE width(VALUE self)
 static VALUE height(VALUE self)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	return INT2FIX(png_get_image_height(reader->png, reader->info));
 }
 
@@ -153,7 +167,7 @@ static VALUE height(VALUE self)
 static VALUE scale_width(VALUE self)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	return INT2FIX(reader->scale_width);
 }
 
@@ -168,7 +182,7 @@ static VALUE scale_width(VALUE self)
 static VALUE set_scale_width(VALUE self, VALUE scale_width)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	raise_if_locked(reader);
 	reader->scale_width = NUM2INT(scale_width);
 	return scale_width;
@@ -185,7 +199,7 @@ static VALUE set_scale_width(VALUE self, VALUE scale_width)
 static VALUE scale_height(VALUE self)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	return INT2FIX(reader->scale_height);
 }
 
@@ -200,7 +214,7 @@ static VALUE scale_height(VALUE self)
 static VALUE set_scale_height(VALUE self, VALUE scale_height)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 	raise_if_locked(reader);
 	reader->scale_height = NUM2INT(scale_height);
 	return scale_height;
@@ -241,14 +255,7 @@ static VALUE each2(struct each_args *args)
  * call-seq:
  *    reader.each(opts, &block) -> self
  *
- * Yields a series of binary strings that make up the output JPEG image.
- *
- * Options is a hash which may have the following symbols:
- *
- * :quality - JPEG quality setting. Betweein 0 and 100.
- * :markers - Custom markers to include in the output JPEG. Must be a hash where
- *   the keys are :APP[0-15] or :COM and the values are arrays of strings that
- *   will be inserted into the markers.
+ * Yields a series of binary strings that make up the output PNG image.
  */
 
 static VALUE each(int argc, VALUE *argv, VALUE self)
@@ -263,7 +270,7 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args(argc, argv, "01", &opts);
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &png_reader_type, reader);
 
 	raise_if_locked(reader);
 	reader->locked = 1;

data/lib/oil.rb

@@ -1,5 +1,5 @@
 module Oil
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
   def self.sniff_signature(io)
     a = io.getc

data/oil.gemspec

@@ -0,0 +1,39 @@
+Gem::Specification.new do |s|
+  s.name = 'oil'
+  s.version = '0.3.0'
+  s.license = 'MIT'
+  s.required_ruby_version = '>= 2.7'
+  s.summary = 'Resize JPEG and PNG images.'
+  s.description = 'Resize JPEG and PNG images, aiming for fast performance and low memory use.'
+  s.authors = ['Timothy Elliott']
+  s.email = 'tle@holymonkey.com'
+  s.files = %w{
+    Rakefile
+    README.rdoc
+    MIT-LICENSE
+    oil.gemspec
+    lib/oil.rb
+    ext/oil/oil_resample.c
+    ext/oil/oil_resample.h
+    ext/oil/oil_resample_internal.h
+    ext/oil/oil_resample_sse2.c
+    ext/oil/oil_libjpeg.c
+    ext/oil/oil_libjpeg.h
+    ext/oil/oil_libpng.c
+    ext/oil/oil_libpng.h
+    ext/oil/jpeg.c
+    ext/oil/png.c
+    ext/oil/oil.c
+    ext/oil/extconf.rb
+    test/helper.rb
+    test/test_jpeg.rb
+    test/test_png.rb
+  }
+  s.homepage = 'https://github.com/ender672/oil'
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/ender672/oil',
+    'bug_tracker_uri' => 'https://github.com/ender672/oil/issues'
+  }
+  s.extensions << 'ext/oil/extconf.rb'
+  s.extra_rdoc_files = ['README.rdoc']
+end

data/test/test_jpeg.rb

@@ -4,7 +4,7 @@ require 'oil'
 require 'stringio'
 require 'helper'
 
-class TestJPEG < MiniTest::Test
+class TestJPEG < Minitest::Test
   # http://stackoverflow.com/a/2349470
   JPEG_DATA = "\
 \xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48\x00\x48\x00\
@@ -16,7 +16,7 @@ class TestJPEG < MiniTest::Test
 \x01\x01\x00\x00\x3f\x00\xd2\xcf\x20\xff\xd9".b
 
   BIG_JPEG = begin
-    s = ""
+    s = String.new
     r = Oil::JPEGReader.new(StringIO.new(JPEG_DATA))
     r.scale_width = 2000
     r.scale_height = 2000
@@ -157,7 +157,7 @@ class TestJPEG < MiniTest::Test
   end
 
   def test_marker_roundtrip
-    str = ""
+    str = String.new
     opts = { markers: { COM: ["hello world", "foobar123"]}}
     Oil::JPEGReader.new(jpeg_io).each(opts){ |s| str << s }
 

data/test/test_png.rb

@@ -4,7 +4,7 @@ require 'oil'
 require 'stringio'
 require 'helper'
 
-class TestPNG < MiniTest::Test
+class TestPNG < Minitest::Test
   # http://garethrees.org/2007/11/14/pngcrush/
   PNG_DATA = "\
 \x89\x50\x4E\x47\x0D\x0A\x1A\x0A\x00\x00\x00\x0D\x49\x48\x44\x52\x00\x00\x00\
@@ -13,7 +13,7 @@ class TestPNG < MiniTest::Test
 \x57\xBF\xAB\xD4\x00\x00\x00\x00\x49\x45\x4E\x44\xAE\x42\x60\x82".b
 
   BIG_PNG = begin
-    s = ""
+    s = String.new
     r = Oil::PNGReader.new(StringIO.new(PNG_DATA))
     r.scale_width = 500
     r.scale_height = 1000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oil
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Timothy Elliott
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2026-04-05 00:00:00.000000000 Z
 dependencies: []
 description: Resize JPEG and PNG images, aiming for fast performance and low memory
   use.
@@ -31,16 +31,21 @@ files:
 - ext/oil/oil_libpng.h
 - ext/oil/oil_resample.c
 - ext/oil/oil_resample.h
+- ext/oil/oil_resample_internal.h
+- ext/oil/oil_resample_sse2.c
 - ext/oil/png.c
 - lib/oil.rb
+- oil.gemspec
 - test/helper.rb
 - test/test_jpeg.rb
 - test/test_png.rb
-homepage: http://github.com/ender672/oil
+homepage: https://github.com/ender672/oil
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/ender672/oil
+  bug_tracker_uri: https://github.com/ender672/oil/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -48,15 +53,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Resize JPEG and PNG images.
 test_files: []