potracer 1.0.4 → 1.0.5

data/ext/potracer/potracer.c

@@ -5,6 +5,24 @@
 
 #include "potracer.h"
 
+static int
+is_colored (char *str, int row, int col, int cols, int size)
+{
+  int i, start;
+  unsigned char v, max, min;
+
+  start = ((row * cols * size) + (col * size));
+  max = min = str[start];
+
+  for (i = 0; i < size; i++) {
+    v =  str[start + i];
+    min = min < v ? min : v;
+    max = max > v ? max : v;
+  }
+
+  return ((min + max) / 2.0) < 128;
+}
+
 static void
 rb_progress (double progress, void *callback)
 {
@@ -210,7 +228,8 @@ bitmap_init(int argc, VALUE *argv, VALUE klass)
 static VALUE
 bitmap_new (int argc, VALUE *argv, VALUE klass)
 {
-  int i, j;
+  int i, j, m, s;
+  unsigned char *bits;
   potrace_bitmap_t *bm;
   VALUE bdata, row;
 
@@ -221,10 +240,20 @@ bitmap_new (int argc, VALUE *argv, VALUE klass)
   bm->map = ALLOC_N(potrace_word, bm->dy * bm->h * BM_WORDSIZE);
 
   if (argc > 2) {
-    for (i = 0; i < bm->h; i++) {
-      row = rb_ary_entry(argv[2], (long)i);
-      for (j = 0; j < bm->w; j++) {
-        BM_PUT(bm, j, i, NUM2INT(rb_ary_entry(row, (long)j)));
+    if (T_STRING == TYPE(argv[2])) {
+      bits = StringValuePtr(argv[2]);
+      m = strlen(StringValuePtr(argv[3]));
+      for (i = 0; i < bm->h; i++) {
+        for (j = 0; j < bm->w; j++) {
+          BM_PUT(bm, j, i, is_colored(bits, i, j, bm->w, m));
+        }
+      }
+    } else {
+      for (i = 0; i < bm->h; i++) {
+        row = rb_ary_entry(argv[2], (long)i);
+        for (j = 0; j < bm->w; j++) {
+          BM_PUT(bm, j, i, NUM2INT(rb_ary_entry(row, (long)j)));
+        }
       }
     }
   }

data/lib/potracer.rb

@@ -10,13 +10,18 @@ module Potracer
       end
     end
 
-    def self.bitmap(bmp, &block)
-      height = bmp.length
-      width = bmp.map {|r| r.length}.max
-      bmp.map! {|r| r.fill(0, r.length, width - r.length)}
+    def self.bitmap(bmp, width=nil, height=nil, map='RGB', &block)
+      width ||= bmp.map {|r| r.length}.max
+      height ||= bmp.length
+
+      unless bmp.is_a? String
+        bmp.map! {|r| r.fill(0, r.length, width - r.length)}
+      end
+
       trace = self.new
       params = Potracer::Params.new
-      bits = Potracer::Bitmap.new(width, height, bmp)
+      bits = Potracer::Bitmap.new(width, height, bmp, map)
+
       if block_given?
         trace.trace(bits, params, &block)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: potracer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings for the potrace library.
 email: k.parnell@gmail.com
@@ -20,9 +20,9 @@ extra_rdoc_files: []
 files:
 - lib/potracer.rb
 - ext/potracer/extconf.h
-- ext/potracer/potracer.h
-- ext/potracer/potracer.c
 - ext/potracer/extconf.rb
+- ext/potracer/potracer.c
+- ext/potracer/potracer.h
 homepage: https://github.com/kparnell/potracer
 licenses: []
 post_install_message: