oil 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39dd91704802e2731a0f67da4743ae67c0535ed
-  data.tar.gz: 9f7767d654f542c11a9fec84f3dc4c097004755c
+  metadata.gz: e7ab475c778d9843d41134e7ad33cb989be6364e
+  data.tar.gz: 91ac3a1eef0a7869e6282116b6de9fea04bb7b89
 SHA512:
-  metadata.gz: 2a862073a15ee977727398689263311dd9868c6c66d518cc840a1e5c7a81f638246b62b1d5d32a4dc2a28d8205a36f4327463a025b4dcb67f491711c19f5d2d5
-  data.tar.gz: 14da2b6aea208767826869a19c6fe8ba4824f15fba435ca1e8862adfe8d19603ce3e7e5a48e66cd693a3afa65c9ee923f6834ac49515c7a6751cd8f23b4e12dd
+  metadata.gz: 619ef438853c052c54f9bc3063a2837d097fac003d3f251e24599532425986042b0c970eccce61ecb268ffb891d89f5efe2d0571d3009477b14f455a94daad08
+  data.tar.gz: 933ed077f03c19a12d72bf8eed8eb79c0cbd0ff21905b9269fa17e49c9a859c0c606b1ee35a8f725ecd144cfddecac641857621bc7bbc05a62080d2f9310ea6c

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.2') do |s|
+s = Gem::Specification.new('oil', '0.1.3') 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.'

data/ext/oil/resample.c

@@ -5,6 +5,9 @@
 #include <string.h>
 #include <stdio.h>
 
+/**
+ * Bicubic interpolation. 2 base taps on either side.
+ */
 #define TAPS 4
 
 /**
@@ -99,26 +102,23 @@ long split_map(unsigned long dim_in, unsigned long dim_out, unsigned long pos,
 }
 
 /**
+ * Given input and output dimension, calculate the total number of taps that
+ * will be needed to calculate an output sample.
+ *
  * When we reduce an image by a factor of two, we need to scale our resampling
  * function by two as well in order to avoid aliasing.
- *
- * Calculate the resampling scalar given input and output dimensions.
  */
-static long calc_tap_mult(long dim_in, long dim_out)
+long calc_taps(long dim_in, long dim_out)
 {
+	long tmp;
+
 	if (dim_out > dim_in) {
-		return 1;
+		return TAPS;
 	}
-	return dim_in / dim_out;
-}
 
-/**
- * Given input and output dimension, calculate the total number of taps that
- * will be needed to calculate an output sample.
- */
-long calc_taps(long dim_in, long dim_out)
-{
-	return calc_tap_mult(dim_in, dim_out) * TAPS;
+	tmp = dim_in * TAPS / dim_out;
+	/* Round up to the nearest even integer */
+	return tmp + (tmp&1);
 }
 
 /**
@@ -151,8 +151,9 @@ static uint32_t fix33_30_to_rgba(fix33_30 r, fix33_30 g, fix33_30 b, fix33_30 a)
  */
 static float catrom(float x)
 {
-	if (x<1)
+	if (x<1) {
 		return (3*x*x*x - 5*x*x + 2) / 2;
+	}
 	return (-1*x*x*x + 5*x*x - 8*x + 4) / 2;
 }
 
@@ -170,26 +171,28 @@ static fix1_30 f_to_fix1_30(float x)
  *
  * The coefficients are stored as fix1_30 fixed point ints in coeffs.
  */
-static void calc_coeffs(fix1_30 *coeffs, float tx, long tap_mult)
+static void calc_coeffs(fix1_30 *coeffs, float tx, long taps)
 {
-	long i, taps, total;
-	float tmp;
+	long i;
+	float tmp, total, tap_mult;
 	fix1_30 tmp_fixed;
 
 	total = 0;
 
-	taps = tap_mult * TAPS;
+	tap_mult = (double)taps / TAPS;
 	tx = 1 - tx - taps / 2;
 
-	for (i=0; i<taps-1; i++) {
-		tmp = catrom(fabs(tx) / tap_mult) / tap_mult;
+	for (i=0; i<taps; i++) {
+		tmp = catrom(fabsf(tx) / tap_mult);
 		tmp_fixed = f_to_fix1_30(tmp);
 		coeffs[i] = tmp_fixed;
-		total += tmp_fixed;
+		total += tmp;
 		tx += 1;
 	}
 
-	coeffs[taps-1] = ONE_FIX1_30 - total;
+	for (i=0; i<taps; i++) {
+		coeffs[i] /= total;
+	}
 }
 
 /**
@@ -264,11 +267,9 @@ void strip_scale(void **in, long strip_height, long width, void *out, float ty,
 	int cmp, int opts)
 {
 	fix1_30 *coeffs;
-	long tap_mult;
 
-	tap_mult = strip_height / TAPS;
 	coeffs = malloc(strip_height * sizeof(fix1_30));
-	calc_coeffs(coeffs, ty, tap_mult);
+	calc_coeffs(coeffs, ty, strip_height);
 
 	if (cmp == 4 && (opts & OIL_FILLER)) {
 		yscale_rgbx(width, strip_height, coeffs, (uint32_t **)in,
@@ -411,12 +412,11 @@ void xscale(unsigned char *in, long in_width, unsigned char *out,
 {
 	float tx;
 	fix1_30 *coeffs;
-	long i, j, xsmp_i, in_chunk, out_chunk, scale_gcd, taps, tap_mult;
+	long i, j, xsmp_i, in_chunk, out_chunk, scale_gcd, taps;
 	unsigned char *out_pos, *rpadv, *tmp;
 	struct padded_sl psl;
 
-	tap_mult = calc_tap_mult(in_width, out_width);
-	taps = tap_mult * TAPS;
+	taps = calc_taps(in_width, out_width);
 	coeffs = malloc(taps * sizeof(fix1_30));
 
 	scale_gcd = gcd(in_width, out_width);
@@ -439,7 +439,7 @@ void xscale(unsigned char *in, long in_width, unsigned char *out,
 
 	for (i=0; i<out_chunk; i++) {
 		xsmp_i = split_map(in_width, out_width, i, &tx);
-		calc_coeffs(coeffs, tx, tap_mult);
+		calc_coeffs(coeffs, tx, taps);
 
 		xsmp_i += 1 - taps / 2;
 		out_pos = out + i * cmp;

data/lib/oil.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oil
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Timothy Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Resize JPEG and PNG images, aiming for fast performance and low memory
   use.
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Resize JPEG and PNG images.