potracer 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da744808fd40ff2c787e78a2d13e7d9c9ac51eb
-  data.tar.gz: d0f3199933c29983afd712f1c4267d58915d20f9
+  metadata.gz: 9a23a82ce4fd9f8947a2730addd0c93b2d6952fc
+  data.tar.gz: 64c87ffb69f6de04d2449c4ddd871fcb056dde6c
 SHA512:
-  metadata.gz: 93356f1cf863cadbb44aa2a5c430e5bd59c810a40f2ba485ee4732cfcdc0ba92ab2e78388b62cd3d8ff49221468cbc121148aa9968f957a4b7b55aec40d86bbe
-  data.tar.gz: df942ab0e3d98cf43b64c28865ed169cdd225c2b285b1fa0a682159677d5d692f80734623b6e778058189a20e6e27047298f8888447a3baaae8d3dbb574dea82
+  metadata.gz: 578798745df2fc50983375f1f6eff6babf7d0307a2f33444ad41d1592192bf8a2a8a96c1ae25075710c175d7a95b46c6205582c6c0c06ee539d18c53aa437a23
+  data.tar.gz: 161b11a94b169f0d8199d5758a7cffd01e3bc71c7023acfc7d4f14e0478eb87b3e00df6fe14cb5631984dbcfc0d26a1100a8b366005d9675b113be709fdf8a09

data/ext/potracer/extconf.rb

@@ -6,14 +6,14 @@ LIBDIR = RbConfig::CONFIG['libdir']
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 
 HEADER_DIRS = ['/opt/local/include', '/usr/local/include', INCLUDEDIR,
-  '/usr/include']
+               '/usr/include']
 
 LIB_DIRS = ['/opt/local/lib', '/usr/local/lib', LIBDIR, '/usr/lib']
 
 dir_config('potrace', HEADER_DIRS, LIB_DIRS)
 
-abort "potracelib.h not found" unless find_header('potracelib.h')
-abort "lib potrace not found" unless find_library('potrace', 'potrace_version')
+abort 'potracelib.h not found' unless find_header('potracelib.h')
+abort 'lib potrace not found' unless find_library('potrace', 'potrace_version')
 
 create_header
 create_makefile('potracer/potracer')

data/lib/potracer.rb

@@ -5,12 +5,10 @@ rescue LoadError
 end
 
 module Potracer
-
   ##
   # This class represents a trace of a Potracer::Bitmap
 
   class Trace
-
     ##
     # Trace the given +bitmap+
     #
@@ -22,11 +20,11 @@ module Potracer
     #   used.
     # * +block+ - optional block called to report trace progress
 
-    def trace(bitmap=nil, params=nil, &block)
+    def trace(bitmap = nil, params = nil, &block)
       if block_given?
-        self.do_trace(bitmap || @bitmap, params || @params, &block)
+        do_trace(bitmap || @bitmap, params || @params, &block)
       else
-        self.do_trace(bitmap || @bitmap, params || @params)
+        do_trace(bitmap || @bitmap, params || @params)
       end
     end
 
@@ -35,8 +33,8 @@ module Potracer
     #
     # ==== Attributes
     #
-    # * +bmp+ - mapped to a Potracer::Bitmap either a multi-dimensional array of
-    #   bits or a string of image data
+    # * +bmp+ - mapped to a Potracer::Bitmap either a multi-dimensional array
+    #   of bits or a string of image data
     # * +width+ - width of the image to be mapped if +bmp+ is a string
     # * +height+ - height of the image to be mapped if +bmp+ is a string
     # * +map+ - pixel data format if +bmp+ is a string
@@ -52,17 +50,10 @@ module Potracer
     #   end
     #   pbar.finish
 
-    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
+    def self.bitmap(bmp, width = nil, height = nil, map = 'RGB', &block)
+      trace = new
       params = Potracer::Params.new
-      bits = Potracer::Bitmap.new(width, height, bmp, map)
+      bits = make_bits(bmp, width, height, map)
 
       if block_given?
         trace.trace(bits, params, &block)
@@ -71,5 +62,18 @@ module Potracer
       end
       trace
     end
+
+    private
+
+    def self.make_bits(bitmap, width, height, map)
+      width ||= bitmap.map { |r| r.length }.max
+      height ||= bitmap.length
+
+      unless bitmap.is_a? String
+        bitmap.map! { |r| r.fill(0, r.length, width - r.length) }
+      end
+
+      Potracer::Bitmap.new(width, height, bitmap, map)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potracer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Kenny Parnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings for the potrace library.
 email: k.parnell@gmail.com