oil 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f7b2521cd984aa636d4d3f55d72b25b3e58f99ddfbaf1fa52dff9dc3e9369d
-  data.tar.gz: 753964c879c07214b84cba0ea49e629e4bff83e490999bfe19fef0fc82c2ce91
+  metadata.gz: a4b80d6ee9098f7a6d91cd5919d1e47667b3a7f7fdcb449c533c16f8a997acf5
+  data.tar.gz: 95fc3862a6bb8bb4dd9e0e795c43973cd507884b25d93c42211dc2006a302388
 SHA512:
-  metadata.gz: cb401d8f26646728db46c67c887e040fe04faf06dacb49f19738102be2defc0b872745dd7166d55a9bf64fb174e7bf9976032e690ed713b5c66fde3ea47f5bb2
-  data.tar.gz: a0620f7f9e1e6c8e1688c2e4c5cbb1c8934613f48c83b5a41b463eacfa24afafb721ae62d5dc1fb8b273c2b6c77de4b293d197bc40da92ffe8f8e73d6875829a
+  metadata.gz: d12b389c79ca87c3a052c771ebc7ce1b44fca4c35c72e0a0c91d9ac5ed3376c978679022c55e2df17ba355cc8950f3583f1f5ee43ca4b4c1abe48a9fe6b91ded
+  data.tar.gz: 0f8d360d64a3609f8cf924388759753f14dab0a82dc194d204c0f0c524b76004c616edf52e68129ecc5a4b220f8a80c5e21c1be57d699b9c3b4f558b32c44b03

data/README.rdoc

@@ -44,11 +44,6 @@ Compile & run unit tests. Should show no warnings and no failing tests:
   $ rake compile
   $ rake test
 
-Valgrind should not complain (ruby-1.9.3p125, compiled with -O3):
-
-  $ valgrind /path/to/ruby -Iext:test test/test_jpeg.rb
-  $ valgrind /path/to/ruby -Iext:test test/test_png.rb
-
 Changes to the interpolator should be analyzed using ResampleScope:
 
   https://github.com/jsummers/resamplescope

data/Rakefile

@@ -6,35 +6,7 @@ Rake::ExtensionTask.new('oil') do |ext|
   ext.lib_dir = 'lib/oil'
 end
 
-s = Gem::Specification.new('oil', '0.2.1') do |s|
-  s.license = 'MIT'
-  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
-    lib/oil.rb
-    ext/oil/oil_resample.c
-    ext/oil/oil_resample.h
-    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 = 'http://github.com/ender672/oil'
-  s.extensions << 'ext/oil/extconf.rb'
-  s.extra_rdoc_files = ['README.rdoc']
-end
+s = Gem::Specification.load('oil.gemspec')
 
 Gem::PackageTask.new(s){}
 

data/ext/oil/jpeg.c

@@ -220,14 +220,17 @@ static void skip_input_data(j_decompress_ptr dinfo, long num_bytes)
 
 /* Ruby GC */
 
-static void deallocate(struct readerdata *reader)
+static void deallocate(void *ptr)
 {
+	struct readerdata *reader = ptr;
 	jpeg_destroy_decompress(&reader->dinfo);
 	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);
 	}
@@ -237,11 +240,23 @@ static void mark(struct readerdata *reader)
 	}
 }
 
+static size_t memsize(const void *ptr)
+{
+	return sizeof(struct readerdata);
+}
+
+static const rb_data_type_t jpeg_reader_type = {
+	"Oil::JPEGReader",
+	{ mark, deallocate, memsize },
+	0, 0,
+	RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 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, &jpeg_reader_type, reader);
 
 	jpeg_std_error(&reader->jerr);
 	reader->jerr.error_exit = error_exit;
@@ -293,7 +308,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 	struct jpeg_decompress_struct *dinfo;
 	int i, marker_code;
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
 	dinfo = &reader->dinfo;
 
 	/* If source_io has already been set, then this is a re-used jpeg reader
@@ -315,10 +330,10 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 	if(!NIL_P(markers)) {
 		Check_Type(markers, T_ARRAY);
 		for (i=0; i<RARRAY_LEN(markers); i++) {
-			if (!SYMBOL_P(RARRAY_PTR(markers)[i])) {
+			if (!SYMBOL_P(RARRAY_AREF(markers, i))) {
 				rb_raise(rb_eTypeError, "Marker code is not a symbol.");
 			}
-			marker_code = sym_to_marker_code(RARRAY_PTR(markers)[i]);
+			marker_code = sym_to_marker_code(RARRAY_AREF(markers, i));
 			jpeg_save_markers(dinfo, marker_code, 0xFFFF);
 		}
 	}
@@ -344,9 +359,9 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 
 static VALUE num_components(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->num_components);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.num_components);
 }
 
 /*
@@ -361,9 +376,9 @@ static VALUE num_components(VALUE self)
 
 static VALUE output_components(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->output_components);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.output_components);
 }
 
 /*
@@ -378,9 +393,9 @@ static VALUE output_components(VALUE self)
 
 static VALUE out_color_components(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->out_color_components);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.out_color_components);
 }
 
 /*
@@ -399,11 +414,11 @@ static VALUE out_color_components(VALUE self)
 
 static VALUE jpeg_color_space(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
+	struct readerdata *reader;
 	ID id;
 
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	id = j_color_space_to_id(dinfo->jpeg_color_space);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	id = j_color_space_to_id(reader->dinfo.jpeg_color_space);
 
 	return ID2SYM(id);
 }
@@ -418,11 +433,11 @@ static VALUE jpeg_color_space(VALUE self)
 
 static VALUE out_color_space(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
+	struct readerdata *reader;
 	ID id;
 
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	id = j_color_space_to_id(dinfo->out_color_space);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	id = j_color_space_to_id(reader->dinfo.out_color_space);
 
 	return ID2SYM(id);
 }
@@ -438,7 +453,7 @@ static VALUE set_out_color_space(VALUE self, VALUE cs)
 {
 	struct readerdata *reader;
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
 	raise_if_locked(reader);
 
 	reader->dinfo.out_color_space = sym_to_j_color_space(cs);
@@ -458,9 +473,9 @@ static VALUE set_out_color_space(VALUE self, VALUE cs)
 
 static VALUE image_width(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->image_width);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.image_width);
 }
 
 /*
@@ -475,9 +490,9 @@ static VALUE image_width(VALUE self)
 
 static VALUE image_height(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->image_height);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.image_height);
 }
 
 /*
@@ -489,9 +504,9 @@ static VALUE image_height(VALUE self)
 
 static VALUE output_width(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->output_width);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.output_width);
 }
 
 /*
@@ -503,9 +518,9 @@ static VALUE output_width(VALUE self)
 
 static VALUE output_height(VALUE self)
 {
-	struct jpeg_decompress_struct * dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->output_height);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.output_height);
 }
 
 /*
@@ -522,13 +537,15 @@ static VALUE output_height(VALUE self)
 
 static VALUE markers(VALUE self)
 {
+	struct readerdata *reader;
 	struct jpeg_decompress_struct *dinfo;
 	jpeg_saved_marker_ptr marker;
 	VALUE hash, ary, key, val;
 
 	hash = rb_hash_new();
 
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	dinfo = &reader->dinfo;
 
 	for (marker=dinfo->marker_list; marker; marker=marker->next) {
 		key = marker_code_to_sym(marker->marker);
@@ -555,9 +572,9 @@ static VALUE markers(VALUE self)
 
 static VALUE scale_num(VALUE self)
 {
-	struct jpeg_decompress_struct *dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->scale_num);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.scale_num);
 }
 
 /*
@@ -573,7 +590,7 @@ static VALUE set_scale_num(VALUE self, VALUE scale_num)
 {
 	struct readerdata *reader;
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
 	raise_if_locked(reader);
 
 	reader->dinfo.scale_num = NUM2INT(scale_num);
@@ -592,9 +609,9 @@ static VALUE set_scale_num(VALUE self, VALUE scale_num)
 
 static VALUE scale_denom(VALUE self)
 {
-	struct jpeg_decompress_struct *dinfo;
-	Data_Get_Struct(self, struct jpeg_decompress_struct, dinfo);
-	return INT2FIX(dinfo->scale_denom);
+	struct readerdata *reader;
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
+	return INT2FIX(reader->dinfo.scale_denom);
 }
 
 /*
@@ -613,7 +630,7 @@ static VALUE set_scale_denom(VALUE self, VALUE scale_denom)
 {
 	struct readerdata *reader;
 
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
 	raise_if_locked(reader);
 
 	reader->dinfo.scale_denom = NUM2INT(scale_denom);
@@ -632,7 +649,7 @@ static VALUE set_scale_denom(VALUE self, VALUE scale_denom)
 static VALUE scale_width(VALUE self)
 {
 	struct readerdata *reader;
-	Data_Get_Struct(self, struct readerdata, reader);
+	TypedData_Get_Struct(self, struct readerdata, &jpeg_reader_type, reader);
 	return INT2FIX(reader->scale_width);
 }
 
@@ -647,7 +664,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, &jpeg_reader_type, reader);
 	raise_if_locked(reader);
 	reader->scale_width = NUM2INT(scale_width);
 	return scale_width;
@@ -664,7 +681,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, &jpeg_reader_type, reader);
 	return INT2FIX(reader->scale_height);
 }
 
@@ -679,7 +696,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, &jpeg_reader_type, reader);
 	raise_if_locked(reader);
 	reader->scale_height = NUM2INT(scale_height);
 	return scale_height;
@@ -839,7 +856,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, &jpeg_reader_type, reader);
 
 	if (!reader->scale_width) {
 		reader->scale_width = reader->dinfo.output_width;

data/ext/oil/oil.c

@@ -9,7 +9,7 @@ static VALUE rb_fix_ratio(VALUE self, VALUE src_w, VALUE src_h, VALUE out_w, VAL
 	out_width = NUM2INT(out_w);
 	out_height = NUM2INT(out_h);
 	oil_fix_ratio(NUM2INT(src_w), NUM2INT(src_h), &out_width, &out_height);
-	ret = rb_ary_new2(2);
+	ret = rb_ary_new_capa(2);
 	rb_ary_push(ret, INT2FIX(out_width));
 	rb_ary_push(ret, INT2FIX(out_height));
 	return ret;
@@ -21,6 +21,7 @@ void Init_png();
 void Init_oil()
 {
 	VALUE mOil;
+	oil_global_init();
 	mOil = rb_const_get(rb_cObject, rb_intern("Oil"));
 	rb_define_singleton_method(mOil, "fix_ratio", rb_fix_ratio, 4);
 	Init_jpeg();

data/ext/oil/oil_libjpeg.c

@@ -58,11 +58,20 @@ void oil_libjpeg_free(struct oil_libjpeg *ol)
 	oil_scale_free(&ol->os);
 }
 
-void oil_libjpeg_read_scanline(struct oil_libjpeg *ol, unsigned char *outbuf)
+int oil_libjpeg_proccess_scanline_part(struct oil_libjpeg *ol)
 {
-	int i;
+	if (!oil_scale_slots(&ol->os)) {
+		return 1;
+	}
+
+	jpeg_read_scanlines(ol->dinfo, &ol->inbuf, 1);
+	oil_scale_in(&ol->os, ol->inbuf);
+	return oil_scale_slots(&ol->os) == 0;
+}
 
-	for (i=oil_scale_slots(&ol->os); i>0; i--) {
+void oil_libjpeg_read_scanline(struct oil_libjpeg *ol, unsigned char *outbuf)
+{
+	while (oil_scale_slots(&ol->os)) {
 		jpeg_read_scanlines(ol->dinfo, &ol->inbuf, 1);
 		oil_scale_in(&ol->os, ol->inbuf);
 	}

data/ext/oil/oil_libjpeg.h

@@ -49,6 +49,7 @@ int oil_libjpeg_init(struct oil_libjpeg *ol,
 void oil_libjpeg_free(struct oil_libjpeg *ol);
 
 void oil_libjpeg_read_scanline(struct oil_libjpeg *ol, unsigned char *outbuf);
+int oil_libjpeg_proccess_scanline_part(struct oil_libjpeg *ol);
 
 enum oil_colorspace jpeg_cs_to_oil(J_COLOR_SPACE cs);
 

data/ext/oil/oil_libpng.c

@@ -34,7 +34,7 @@ static unsigned char **alloc_full_image_buf(int height, int rowbytes)
 	for (i=0; i<height; i++) {
 		imgbuf[i] = malloc(rowbytes);
 		if (!imgbuf[i]) {
-			for (j=0; j<i-1; j++) {
+			for (j=0; j<i; j++) {
 				free(imgbuf[j]);
 			}
 			free(imgbuf);
@@ -75,7 +75,6 @@ int oil_libpng_init(struct oil_libpng *ol, png_structp rpng, png_infop rinfo,
 	ret = oil_scale_init(&ol->os, in_height, out_height, in_width,
 		out_width, cs);
 	if (ret!=0) {
-		free(ol->inbuf);
 		return ret;
 	}
 
@@ -112,33 +111,47 @@ void oil_libpng_free(struct oil_libpng *ol)
 	oil_scale_free(&ol->os);
 }
 
-static void read_scanline_interlaced(struct oil_libpng *ol, unsigned char *outbuf)
+static void read_scanline_interlaced(struct oil_libpng *ol)
 {
-	int i;
-
-	for (i=oil_scale_slots(&ol->os); i>0; i--) {
+	while (oil_scale_slots(&ol->os)) {
 		oil_scale_in(&ol->os, ol->inimage[ol->in_vpos++]);
 	}
 }
 
-static void read_scanline(struct oil_libpng *ol, unsigned char *outbuf)
+static void read_scanline(struct oil_libpng *ol)
 {
-	int i;
+	while (oil_scale_slots(&ol->os)) {
+		png_read_row(ol->rpng, ol->inbuf, NULL);
+		oil_scale_in(&ol->os, ol->inbuf);
+	}
+}
 
-	for (i=oil_scale_slots(&ol->os); i>0; i--) {
+int oil_libpng_proccess_scanline_part(struct oil_libpng *ol)
+{
+	if (!oil_scale_slots(&ol->os)) {
+		return 1;
+	}
+
+	switch (png_get_interlace_type(ol->rpng, ol->rinfo)) {
+	case PNG_INTERLACE_NONE:
 		png_read_row(ol->rpng, ol->inbuf, NULL);
 		oil_scale_in(&ol->os, ol->inbuf);
+		break;
+	case PNG_INTERLACE_ADAM7:
+		oil_scale_in(&ol->os, ol->inimage[ol->in_vpos++]);
+		break;
 	}
+	return oil_scale_slots(&ol->os) == 0;
 }
 
 void oil_libpng_read_scanline(struct oil_libpng *ol, unsigned char *outbuf)
 {
 	switch (png_get_interlace_type(ol->rpng, ol->rinfo)) {
 	case PNG_INTERLACE_NONE:
-		read_scanline(ol, outbuf);
+		read_scanline(ol);
 		break;
 	case PNG_INTERLACE_ADAM7:
-		read_scanline_interlaced(ol, outbuf);
+		read_scanline_interlaced(ol);
 		break;
 	}
 	oil_scale_out(&ol->os, outbuf);

data/ext/oil/oil_libpng.h

@@ -52,6 +52,7 @@ int oil_libpng_init(struct oil_libpng *ol, png_structp rpng, png_infop rinfo,
 void oil_libpng_free(struct oil_libpng *ol);
 
 void oil_libpng_read_scanline(struct oil_libpng *ol, unsigned char *outbuf);
+int oil_libpng_proccess_scanline_part(struct oil_libpng *ol);
 
 enum oil_colorspace png_cs_to_oil(png_byte cs);