oil 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8667c59ce2f99a70651d4f217513aa0de0ee294b444bba1dcfa5e6123d841c18
-  data.tar.gz: b32ae44e0fc03708e7ea10a4f0e9b10378377fcc1ce78c6e74a15f56a543526c
+  metadata.gz: a4b80d6ee9098f7a6d91cd5919d1e47667b3a7f7fdcb449c533c16f8a997acf5
+  data.tar.gz: 95fc3862a6bb8bb4dd9e0e795c43973cd507884b25d93c42211dc2006a302388
 SHA512:
-  metadata.gz: 33d09f09e4f4f897e98e50496415485d5ed5861b0ee260fd6eee7cb491c93d1844ec4567957d3dfeb4491be23f9fdd10e3ec9ba544e0d7b0c88d23d785146aca
-  data.tar.gz: ec308eb4710bc46faffbe24d802539d6fabf33d0a37e2edf2fd6c2706508fac486efb12e8bbc41960e7b4f018f1bda286054fc1526564210441875fcb83a1eaf
+  metadata.gz: d12b389c79ca87c3a052c771ebc7ce1b44fca4c35c72e0a0c91d9ac5ed3376c978679022c55e2df17ba355cc8950f3583f1f5ee43ca4b4c1abe48a9fe6b91ded
+  data.tar.gz: 0f8d360d64a3609f8cf924388759753f14dab0a82dc194d204c0f0c524b76004c616edf52e68129ecc5a4b220f8a80c5e21c1be57d699b9c3b4f558b32c44b03

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Timothy Elliott
+Copyright (c) 2019 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

@@ -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,31 +6,7 @@ Rake::ExtensionTask.new('oil') do |ext|
   ext.lib_dir = 'lib/oil'
 end
 
-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.'
-  s.authors = ['Timothy Elliott']
-  s.email = 'tle@holymonkey.com'
-  s.files = %w{
-    Rakefile
-    README.rdoc
-    MIT-LICENSE
-    lib/oil.rb
-    ext/oil/resample.c
-    ext/oil/resample.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

@@ -1,7 +1,7 @@
 #include <ruby.h>
 #include <ruby/st.h>
 #include <jpeglib.h>
-#include "resample.h"
+#include "oil_libjpeg.h"
 
 #define READ_SIZE 1024
 #define WRITE_SIZE 1024
@@ -170,8 +170,8 @@ struct readerdata {
 	int locked;
 	VALUE source_io;
 	VALUE buffer;
-	uint32_t scale_width;
-	uint32_t scale_height;
+	int scale_width;
+	int scale_height;
 };
 
 static void null_jdecompress(j_decompress_ptr dinfo) {}
@@ -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;
@@ -754,8 +771,7 @@ struct write_jpeg_args {
 	struct writerdata *writer;
 	unsigned char *inwidthbuf;
 	unsigned char *outwidthbuf;
-	struct yscaler ys;
-	struct preprocess_xscaler xs;
+	struct oil_libjpeg ol;
 };
 
 static VALUE each2(struct write_jpeg_args *args)
@@ -763,12 +779,13 @@ static VALUE each2(struct write_jpeg_args *args)
 	struct writerdata *writer;
 	struct jpeg_decompress_struct *dinfo;
 	struct jpeg_compress_struct *cinfo;
-	unsigned char *outwidthbuf, *xinbuf;
-	uint16_t *yinbuf;
-	uint32_t i, scalex, scaley;
+	unsigned char *outwidthbuf;
+	int i, scalex, scaley;
 	VALUE quality, markers;
+	struct oil_libjpeg *ol;
 
 	writer = args->writer;
+	ol = &args->ol;
 	outwidthbuf = args->outwidthbuf;
 	dinfo = &args->reader->dinfo;
 	cinfo = &writer->cinfo;
@@ -784,8 +801,6 @@ static VALUE each2(struct write_jpeg_args *args)
 	writer->cinfo.in_color_space = dinfo->out_color_space;
 	writer->cinfo.input_components = dinfo->output_components;
 
-	xinbuf = args->inwidthbuf;
-
 	jpeg_set_defaults(cinfo);
 
 	if (!NIL_P(args->opts)) {
@@ -806,12 +821,8 @@ static VALUE each2(struct write_jpeg_args *args)
 		}
 	}
 
-	for(i=0; i<scaley; i++) {
-		while ((yinbuf = yscaler_next(&args->ys))) {
-			jpeg_read_scanlines(dinfo, (JSAMPARRAY)&xinbuf, 1);
-			preprocess_xscaler_scale(&args->xs, xinbuf, yinbuf);
-		}
-		yscaler_scale(&args->ys, outwidthbuf, i);
+	for(i=scaley; i>0; i--) {
+		oil_libjpeg_read_scanline(ol, outwidthbuf);
 		jpeg_write_scanlines(cinfo, (JSAMPARRAY)&outwidthbuf, 1);
 	}
 
@@ -820,24 +831,6 @@ 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
@@ -856,16 +849,14 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 {
 	struct readerdata *reader;
 	struct writerdata writer;
-	int state;
+	int state, width_out, ret;
 	struct write_jpeg_args args;
-	unsigned char *inwidthbuf, *outwidthbuf;
-	uint32_t width_in, width_out;
+	unsigned char *outwidthbuf;
 	VALUE opts;
-	enum oil_colorspace cs;
 
 	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;
@@ -877,27 +868,29 @@ static VALUE each(int argc, VALUE *argv, VALUE self)
 	writer.cinfo.err = &reader->jerr;
 	jpeg_create_compress(&writer.cinfo);
 
-	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);
+	ret = oil_libjpeg_init(&args.ol, &reader->dinfo, width_out,
+		reader->scale_height);
+	if (ret!=0) {
+		jpeg_destroy_compress(&writer.cinfo);
+		rb_raise(rb_eRuntimeError, "Unable to allocate memory.");
+	}
+	outwidthbuf = malloc(width_out * OIL_CMP(args.ol.os.cs));
+	if (!outwidthbuf) {
+		oil_libjpeg_free(&args.ol);
+		jpeg_destroy_compress(&writer.cinfo);
+		rb_raise(rb_eRuntimeError, "Unable to allocate memory.");
+	}
 
 	args.reader = reader;
 	args.opts = opts;
 	args.writer = &writer;
-	args.inwidthbuf = inwidthbuf;
 	args.outwidthbuf = outwidthbuf;
 	reader->locked = 1;
 	rb_protect((VALUE(*)(VALUE))each2, (VALUE)&args, &state);
 
-	yscaler_free(&args.ys);
-	preprocess_xscaler_free(&args.xs);
+	oil_libjpeg_free(&args.ol);
 	free(outwidthbuf);
-	free(inwidthbuf);
 	jpeg_destroy_compress(&writer.cinfo);
 
 	if (state) {

data/ext/oil/oil.c

@@ -1,14 +1,15 @@
 #include <ruby.h>
-#include "resample.h"
+#include "oil_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;
+	int 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);
+	oil_fix_ratio(NUM2INT(src_w), NUM2INT(src_h), &out_width, &out_height);
+	ret = rb_ary_new_capa(2);
 	rb_ary_push(ret, INT2FIX(out_width));
 	rb_ary_push(ret, INT2FIX(out_height));
 	return ret;
@@ -20,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

@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2014-2019 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "oil_libjpeg.h"
+#include <stdlib.h>
+
+int oil_libjpeg_init(struct oil_libjpeg *ol,
+	struct jpeg_decompress_struct *dinfo, int out_width, int out_height)
+{
+	int ret;
+	enum oil_colorspace cs;
+
+	ol->dinfo = dinfo;
+
+	cs = jpeg_cs_to_oil(dinfo->out_color_space);
+	if (cs == OIL_CS_UNKNOWN) {
+		return -1;
+	}
+
+	ol->inbuf = malloc(dinfo->output_width * dinfo->output_components);
+	if (!ol->inbuf) {
+		return -2;
+	}
+
+	ret = oil_scale_init(&ol->os, dinfo->output_height, out_height,
+		dinfo->output_width, out_width, cs);
+	if (ret!=0) {
+		free(ol->inbuf);
+		return ret;
+	}
+
+	return 0;
+}
+
+void oil_libjpeg_free(struct oil_libjpeg *ol)
+{
+	if (ol->inbuf) {
+		free(ol->inbuf);
+	}
+	oil_scale_free(&ol->os);
+}
+
+int oil_libjpeg_proccess_scanline_part(struct oil_libjpeg *ol)
+{
+	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;
+}
+
+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);
+	}
+	oil_scale_out(&ol->os, outbuf);
+}
+
+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:
+	case JCS_EXT_BGRX:
+		return OIL_CS_RGBX;
+#endif
+	default:
+		return OIL_CS_UNKNOWN;
+	}
+}
+
+J_COLOR_SPACE oil_cs_to_jpeg(enum oil_colorspace cs)
+{
+	switch(cs) {
+	case OIL_CS_G:
+		return JCS_GRAYSCALE;
+	case OIL_CS_RGB:
+		return JCS_RGB;
+	case OIL_CS_CMYK:
+		return JCS_CMYK;
+	default:
+		return JCS_UNKNOWN;
+	}
+}
+