oil 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7ab475c778d9843d41134e7ad33cb989be6364e
-  data.tar.gz: 91ac3a1eef0a7869e6282116b6de9fea04bb7b89
+SHA256:
+  metadata.gz: 8667c59ce2f99a70651d4f217513aa0de0ee294b444bba1dcfa5e6123d841c18
+  data.tar.gz: b32ae44e0fc03708e7ea10a4f0e9b10378377fcc1ce78c6e74a15f56a543526c
 SHA512:
-  metadata.gz: 619ef438853c052c54f9bc3063a2837d097fac003d3f251e24599532425986042b0c970eccce61ecb268ffb891d89f5efe2d0571d3009477b14f455a94daad08
-  data.tar.gz: 933ed077f03c19a12d72bf8eed8eb79c0cbd0ff21905b9269fa17e49c9a859c0c606b1ee35a8f725ecd144cfddecac641857621bc7bbc05a62080d2f9310ea6c
+  metadata.gz: 33d09f09e4f4f897e98e50496415485d5ed5861b0ee260fd6eee7cb491c93d1844ec4567957d3dfeb4491be23f9fdd10e3ec9ba544e0d7b0c88d23d785146aca
+  data.tar.gz: ec308eb4710bc46faffbe24d802539d6fabf33d0a37e2edf2fd6c2706508fac486efb12e8bbc41960e7b4f018f1bda286054fc1526564210441875fcb83a1eaf

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Timothy Elliott
+Copyright (c) 2018 Timothy Elliott
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -11,6 +11,9 @@ performance and low memory use.
 
   $ gem install oil
 
+  # when using homebrew w/ jpeg-turbo
+  $ gem install oil --with-ldflags=-L/usr/local/opt/jpeg-turbo/lib --with-cflags=-I/usr/local/opt/jpeg-turbo/include
+
 == SYNOPSIS:
 
   require 'oil'

data/Rakefile

@@ -6,7 +6,7 @@ Rake::ExtensionTask.new('oil') do |ext|
   ext.lib_dir = 'lib/oil'
 end
 
-s = Gem::Specification.new('oil', '0.1.3') do |s|
+s = Gem::Specification.new('oil', '0.2.0') 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.'
@@ -19,8 +19,6 @@ s = Gem::Specification.new('oil', '0.1.3') do |s|
     lib/oil.rb
     ext/oil/resample.c
     ext/oil/resample.h
-    ext/oil/yscaler.c
-    ext/oil/yscaler.h
     ext/oil/jpeg.c
     ext/oil/png.c
     ext/oil/oil.c

data/ext/oil/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-$CFLAGS += " -O3 -ffast-math -march=native"
+$CFLAGS += " -O3 -march=native"
 
 unless have_header('jpeglib.h')
   abort "libjpeg headers were not found."

data/ext/oil/jpeg.c

@@ -2,7 +2,6 @@
 #include <ruby/st.h>
 #include <jpeglib.h>
 #include "resample.h"
-#include "yscaler.h"
 
 #define READ_SIZE 1024
 #define WRITE_SIZE 1024
@@ -30,6 +29,10 @@ static ID j_color_space_to_id(J_COLOR_SPACE cs)
 		return id_CMYK;
 	case JCS_YCCK:
 		return id_YCCK;
+#ifdef JCS_EXTENSIONS
+	case JCS_EXT_RGBX:
+		return id_RGBX;
+#endif
 	default:
 		return id_UNKNOWN;
 	}
@@ -50,7 +53,11 @@ static J_COLOR_SPACE sym_to_j_color_space(VALUE sym)
 	} else if (rb == id_YCCK) {
 		return JCS_YCCK;
 	} else if (rb == id_RGBX) {
+#ifdef JCS_EXTENSIONS
 		return JCS_EXT_RGBX;
+#else
+		return JCS_RGB;
+#endif
 	}
 	rb_raise(rb_eRuntimeError, "Color space not recognized.");
 }
@@ -103,37 +110,37 @@ static VALUE marker_code_to_sym(int marker_code)
 	case JPEG_COM:
 		return ID2SYM(id_COM);
 	case JPEG_APP0:
-		return ID2SYM(id_APP0);	
+		return ID2SYM(id_APP0);
 	case JPEG_APP0 + 1:
-		return ID2SYM(id_APP1);	
+		return ID2SYM(id_APP1);
 	case JPEG_APP0 + 2:
-		return ID2SYM(id_APP2);	
+		return ID2SYM(id_APP2);
 	case JPEG_APP0 + 3:
-		return ID2SYM(id_APP3);	
+		return ID2SYM(id_APP3);
 	case JPEG_APP0 + 4:
-		return ID2SYM(id_APP4);	
+		return ID2SYM(id_APP4);
 	case JPEG_APP0 + 5:
-		return ID2SYM(id_APP5);	
+		return ID2SYM(id_APP5);
 	case JPEG_APP0 + 6:
-		return ID2SYM(id_APP6);	
+		return ID2SYM(id_APP6);
 	case JPEG_APP0 + 7:
-		return ID2SYM(id_APP7);	
+		return ID2SYM(id_APP7);
 	case JPEG_APP0 + 8:
-		return ID2SYM(id_APP8);	
+		return ID2SYM(id_APP8);
 	case JPEG_APP0 + 9:
-		return ID2SYM(id_APP9);	
+		return ID2SYM(id_APP9);
 	case JPEG_APP0 + 10:
-		return ID2SYM(id_APP10);	
+		return ID2SYM(id_APP10);
 	case JPEG_APP0 + 11:
-		return ID2SYM(id_APP11);	
+		return ID2SYM(id_APP11);
 	case JPEG_APP0 + 12:
-		return ID2SYM(id_APP12);	
+		return ID2SYM(id_APP12);
 	case JPEG_APP0 + 13:
-		return ID2SYM(id_APP13);	
+		return ID2SYM(id_APP13);
 	case JPEG_APP0 + 14:
-		return ID2SYM(id_APP14);	
+		return ID2SYM(id_APP14);
 	case JPEG_APP0 + 15:
-		return ID2SYM(id_APP15);	
+		return ID2SYM(id_APP15);
 	}
 	rb_raise(rb_eRuntimeError, "Marker code not recognized.");
 }
@@ -274,7 +281,7 @@ static void raise_if_locked(struct readerdata *reader)
  *
  *     io = File.open("image.jpg", "r")
  *     reader = Oil::JPEGReader.new(io)
- * 
+ *
  *     io = File.open("image.jpg", "r")
  *     reader = Oil::JPEGReader.new(io, [:APP1, :APP2])
  */
@@ -747,7 +754,8 @@ struct write_jpeg_args {
 	struct writerdata *writer;
 	unsigned char *inwidthbuf;
 	unsigned char *outwidthbuf;
-	struct yscaler *ys;
+	struct yscaler ys;
+	struct preprocess_xscaler xs;
 };
 
 static VALUE each2(struct write_jpeg_args *args)
@@ -755,24 +763,18 @@ static VALUE each2(struct write_jpeg_args *args)
 	struct writerdata *writer;
 	struct jpeg_decompress_struct *dinfo;
 	struct jpeg_compress_struct *cinfo;
-	unsigned char *inwidthbuf, *outwidthbuf, *yinbuf;
-	struct yscaler *ys;
+	unsigned char *outwidthbuf, *xinbuf;
+	uint16_t *yinbuf;
 	uint32_t i, scalex, scaley;
 	VALUE quality, markers;
-	int cmp, opts;
 
 	writer = args->writer;
-	inwidthbuf = args->inwidthbuf;
 	outwidthbuf = args->outwidthbuf;
-	ys = args->ys;
 	dinfo = &args->reader->dinfo;
 	cinfo = &writer->cinfo;
 	scalex = args->reader->scale_width;
 	scaley = args->reader->scale_height;
 
-	cmp = dinfo->output_components;
-	opts = dinfo->out_color_space == JCS_EXT_RGBX ? OIL_FILLER : 0;
-
 	writer->mgr.init_destination = init_destination;
 	writer->mgr.empty_output_buffer = empty_output_buffer;
 	writer->mgr.term_destination = term_destination;
@@ -780,7 +782,9 @@ static VALUE each2(struct write_jpeg_args *args)
 	writer->cinfo.image_width = scalex;
 	writer->cinfo.image_height = scaley;
 	writer->cinfo.in_color_space = dinfo->out_color_space;
-	writer->cinfo.input_components = cmp;
+	writer->cinfo.input_components = dinfo->output_components;
+
+	xinbuf = args->inwidthbuf;
 
 	jpeg_set_defaults(cinfo);
 
@@ -803,11 +807,11 @@ static VALUE each2(struct write_jpeg_args *args)
 	}
 
 	for(i=0; i<scaley; i++) {
-		while ((yinbuf = yscaler_next(ys))) {
-			jpeg_read_scanlines(dinfo, (JSAMPARRAY)&inwidthbuf, 1);
-			xscale(inwidthbuf, dinfo->output_width, yinbuf, scalex, cmp, opts);
+		while ((yinbuf = yscaler_next(&args->ys))) {
+			jpeg_read_scanlines(dinfo, (JSAMPARRAY)&xinbuf, 1);
+			preprocess_xscaler_scale(&args->xs, xinbuf, yinbuf);
 		}
-		yscaler_scale(ys, outwidthbuf, scalex, cmp, opts);
+		yscaler_scale(&args->ys, outwidthbuf, i);
 		jpeg_write_scanlines(cinfo, (JSAMPARRAY)&outwidthbuf, 1);
 	}
 
@@ -816,6 +820,24 @@ static VALUE each2(struct write_jpeg_args *args)
 	return Qnil;
 }
 
+static enum oil_colorspace jpeg_cs_to_oil(J_COLOR_SPACE cs)
+{
+	switch(cs) {
+	case JCS_GRAYSCALE:
+		return OIL_CS_G;
+	case JCS_RGB:
+		return OIL_CS_RGB;
+	case JCS_CMYK:
+		return OIL_CS_CMYK;
+#ifdef JCS_EXTENSIONS
+	case JCS_EXT_RGBX:
+		return OIL_CS_RGBX;
+#endif
+	default:
+		rb_raise(rb_eRuntimeError, "Color space not recognized.");
+	}
+}
+
 /*
  * call-seq:
  *    reader.each(opts, &block) -> self
@@ -834,11 +856,12 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 {
 	struct readerdata *reader;
 	struct writerdata writer;
-	int cmp, state;
+	int state;
 	struct write_jpeg_args args;
 	unsigned char *inwidthbuf, *outwidthbuf;
-	struct yscaler ys;
+	uint32_t width_in, width_out;
 	VALUE opts;
+	enum oil_colorspace cs;
 
 	rb_scan_args(argc, argv, "01", &opts);
 
@@ -854,24 +877,27 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 	writer.cinfo.err = &reader->jerr;
 	jpeg_create_compress(&writer.cinfo);
 
-	cmp = reader->dinfo.output_components;
-	inwidthbuf = malloc(reader->dinfo.output_width * cmp);
-	outwidthbuf = malloc(reader->scale_width * cmp);
-	yscaler_init(&ys, reader->dinfo.output_height, reader->scale_height,
-		reader->scale_width * cmp);
+	cs = jpeg_cs_to_oil(reader->dinfo.out_color_space);
+	width_in = reader->dinfo.output_width;
+	width_out = reader->scale_width;
+	inwidthbuf = malloc(width_in * CS_TO_CMP(cs));
+	outwidthbuf = malloc(width_out * CS_TO_CMP(cs));
+	preprocess_xscaler_init(&args.xs, width_in, width_out, cs);
+	yscaler_init(&args.ys, reader->dinfo.output_height, reader->scale_height,
+		width_out, cs);
 
 	args.reader = reader;
 	args.opts = opts;
 	args.writer = &writer;
 	args.inwidthbuf = inwidthbuf;
 	args.outwidthbuf = outwidthbuf;
-	args.ys = &ys;
 	reader->locked = 1;
 	rb_protect((VALUE(*)(VALUE))each2, (VALUE)&args, &state);
 
-	yscaler_free(&ys);
-	free(inwidthbuf);
+	yscaler_free(&args.ys);
+	preprocess_xscaler_free(&args.xs);
 	free(outwidthbuf);
+	free(inwidthbuf);
 	jpeg_destroy_compress(&writer.cinfo);
 
 	if (state) {

data/ext/oil/oil.c

@@ -1,10 +1,27 @@
 #include <ruby.h>
+#include "resample.h"
+
+static VALUE rb_fix_ratio(VALUE self, VALUE src_w, VALUE src_h, VALUE out_w, VALUE out_h)
+{
+	uint32_t out_width, out_height;
+	VALUE ret;
+	out_width = NUM2INT(out_w);
+	out_height = NUM2INT(out_h);
+	fix_ratio(NUM2INT(src_w), NUM2INT(src_h), &out_width, &out_height);
+	ret = rb_ary_new2(2);
+	rb_ary_push(ret, INT2FIX(out_width));
+	rb_ary_push(ret, INT2FIX(out_height));
+	return ret;
+}
 
 void Init_jpeg();
 void Init_png();
 
 void Init_oil()
 {
-   Init_jpeg();
-   Init_png();
+	VALUE mOil;
+	mOil = rb_const_get(rb_cObject, rb_intern("Oil"));
+	rb_define_singleton_method(mOil, "fix_ratio", rb_fix_ratio, 4);
+	Init_jpeg();
+	Init_png();
 }

data/ext/oil/png.c

@@ -1,7 +1,6 @@
 #include <ruby.h>
 #include <png.h>
 #include "resample.h"
-#include "yscaler.h"
 
 static ID id_read;
 
@@ -215,34 +214,37 @@ struct each_args {
 	unsigned char *outwidthbuf;
 	unsigned char **scanlines;
 	struct yscaler ys;
+	struct preprocess_xscaler xs;
 };
 
 static VALUE each_interlace(struct each_args *args)
 {
 	struct readerdata *reader;
-	unsigned char *inwidthbuf, *outwidthbuf;
-	uint32_t i, width, height, scalex, scaley;
-	int cmp;
+	unsigned char **scanlines, *outwidthbuf;
+	uint32_t i, n, scaley;
+	uint16_t *yinbuf;
+	struct yscaler *ys;
+	struct preprocess_xscaler *xs;
 
 	reader = args->reader;
-	inwidthbuf = args->inwidthbuf;
+	xs = &args->xs;
+	ys = &args->ys;
+	scanlines = args->scanlines;
 	outwidthbuf = args->outwidthbuf;
-	scalex = reader->scale_width;
 	scaley = reader->scale_height;
-	cmp = png_get_channels(reader->png, reader->info);
-	width = png_get_image_width(reader->png, reader->info);
-	height = png_get_image_height(reader->png, reader->info);
 
 	png_write_info(args->wpng, args->winfo);
 	png_read_image(args->reader->png, (png_bytepp)args->scanlines);
 
-	for (i=0; i<scaley; i++) {
-		yscaler_prealloc_scale(height, scaley,
-			(uint8_t **)args->scanlines, (uint8_t *)inwidthbuf,
-			i, width, cmp, 0);
-		xscale(inwidthbuf, width, outwidthbuf, scalex, cmp, 0);
+	n = 0;
+	for(i=0; i<scaley; i++) {
+		while ((yinbuf = yscaler_next(ys))) {
+			preprocess_xscaler_scale(xs, scanlines[n++], yinbuf);
+		}
+		yscaler_scale(ys, outwidthbuf, i);
 		png_write_row(args->wpng, outwidthbuf);
 	}
+
 	png_write_end(args->wpng, args->winfo);
 	return Qnil;
 }
@@ -250,28 +252,27 @@ static VALUE each_interlace(struct each_args *args)
 static VALUE each_interlace_none(struct each_args *args)
 {
 	struct readerdata *reader;
-	unsigned char *inwidthbuf, *outwidthbuf, *yinbuf;
+	unsigned char *inwidthbuf, *outwidthbuf;
+	uint16_t *yinbuf;
+	struct preprocess_xscaler *xs;
 	struct yscaler *ys;
-	uint32_t i, width, scalex, scaley;
-	int cmp;
+	uint32_t i, scaley;
 
 	reader = args->reader;
+	xs = &args->xs;
 	inwidthbuf = args->inwidthbuf;
 	outwidthbuf = args->outwidthbuf;
 	ys = &args->ys;
-	scalex = reader->scale_width;
 	scaley = reader->scale_height;
-	cmp = png_get_channels(reader->png, reader->info);
-	width = png_get_image_width(reader->png, reader->info);
 
 	png_write_info(args->wpng, args->winfo);
 
 	for(i=0; i<scaley; i++) {
 		while ((yinbuf = yscaler_next(ys))) {
 			png_read_row(reader->png, inwidthbuf, NULL);
-			xscale(inwidthbuf, width, yinbuf, scalex, cmp, 0);
+			preprocess_xscaler_scale(xs, inwidthbuf, yinbuf);
 		}
-		yscaler_scale(ys, outwidthbuf, scalex, cmp, 0);
+		yscaler_scale(ys, outwidthbuf, i);
 		png_write_row(args->wpng, outwidthbuf);
 	}
 
@@ -279,6 +280,21 @@ static VALUE each_interlace_none(struct each_args *args)
 	return Qnil;
 }
 
+static enum oil_colorspace png_cs_to_oil(png_byte cs)
+{
+	switch(cs) {
+	case PNG_COLOR_TYPE_GRAY:
+		return OIL_CS_G;
+	case PNG_COLOR_TYPE_GA:
+		return OIL_CS_GA;
+	case PNG_COLOR_TYPE_RGB:
+		return OIL_CS_RGB;
+	case PNG_COLOR_TYPE_RGBA:
+		return OIL_CS_RGBA;
+	}
+	rb_raise(rb_eRuntimeError, "Color space not recognized.");
+}
+
 /*
  * call-seq:
  *    reader.each(opts, &block) -> self
@@ -301,10 +317,11 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 	VALUE opts;
 	int cmp, state;
 	struct each_args args;
-	uint32_t i, height;
+	uint32_t i, height, width;
 	png_byte ctype;
 	unsigned char **scanlines;
 	size_t row_bytes;
+	enum oil_colorspace cs;
 
 	rb_scan_args(argc, argv, "01", &opts);
 
@@ -313,32 +330,35 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 	raise_if_locked(reader);
 	reader->locked = 1;
 
+	cmp = png_get_channels(reader->png, reader->info);
+	ctype = png_get_color_type(reader->png, reader->info);
+	cs = png_cs_to_oil(ctype);
+
 	wpng = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
 		(png_error_ptr)error, (png_error_ptr)warning);
 	winfo = png_create_info_struct(wpng);
 	png_set_write_fn(wpng, 0, write_data_fn, flush_data_fn);
 
-	cmp = png_get_channels(reader->png, reader->info);
-	ctype = png_get_color_type(reader->png, reader->info);
-
 	png_set_IHDR(wpng, winfo, reader->scale_width, reader->scale_height, 8,
 		ctype, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
 		PNG_FILTER_TYPE_DEFAULT);
 
+	width = png_get_image_width(reader->png, reader->info);
 	height = png_get_image_height(reader->png, reader->info);
 	row_bytes = png_get_rowbytes(reader->png, reader->info);
 
 	args.reader = reader;
 	args.wpng = wpng;
 	args.winfo = winfo;
-	args.inwidthbuf = malloc(row_bytes);
 	args.outwidthbuf = malloc(reader->scale_width * cmp);
 
+	preprocess_xscaler_init(&args.xs, width, reader->scale_width, cs);
+	yscaler_init(&args.ys, height, reader->scale_height, reader->scale_width, cs);
+
 	if (png_get_interlace_type(reader->png, reader->info) == PNG_INTERLACE_NONE) {
-		yscaler_init(&args.ys, height, reader->scale_height,
-			reader->scale_width * cmp);
+		args.inwidthbuf = malloc(width * cmp);
 		rb_protect((VALUE(*)(VALUE))each_interlace_none, (VALUE)&args, &state);
-		yscaler_free(&args.ys);
+		free(args.inwidthbuf);
 	} else {
 		scanlines = malloc(height * sizeof(unsigned char *));
 		for (i=0; i<height; i++) {
@@ -354,7 +374,8 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 		free(scanlines);
 	}
 
-	free(args.inwidthbuf);
+	yscaler_free(&args.ys);
+	preprocess_xscaler_free(&args.xs);
 	free(args.outwidthbuf);
 	png_destroy_write_struct(&wpng, &winfo);