tesseract-ocr 0.0.1.4 → 0.0.2

data/README.md

@@ -19,15 +19,14 @@ Example
 require 'tesseract'
 
 e = Tesseract::Engine.new {|e|
-	e.language = :eng
-
-	e.blacklist '|'
+	e.language  = :eng
+	e.blacklist = '|'
 }
 
 e.text_for('test/first.png').strip # => 'ABC'
 e.words_for('test/second.png') # => ["I'm", "12", "and", "what", "is", "this.", "INSTALL", "GENTOO", "OH", "HAI", "1234"]
 
-e.with { |e| e.whitelist '1234567890' }.text_for('test/second.png') # => "11111 12 3116 1111113115111151\n11157411 6511700\n014 11141 1234\n\n"
+e.with { |e| e.whitelist = '1234567890' }.text_for('test/second.png') # => "11111 12 3116 1111113115111151\n11157411 6511700\n014 11141 1234\n\n"
 ```
 
 You can pass to `#text_for` either a path, an IO object or a string containing the image,

data/lib/tesseract/api.rb

@@ -22,7 +22,7 @@
 # or implied, of meh.
 #++
 
-require 'iso-639'
+require 'tesseract/extensions'
 require 'tesseract/c'
 
 module Tesseract
@@ -32,33 +32,35 @@ class API
 	# Get a pointer to a tesseract-ocr usable image from a path, a string
 	# with the data or an IO stream.
 	def self.image_for (image)
-		if image.is_a?(String) && File.exists?(File.expand_path(image))
-			C::pix_read(File.expand_path(image))
-		elsif image.is_a?(String)
-			C::pix_read_mem(image, image.bytesize)
-		elsif image.is_a?(IO)
-			C::pix_read_stream(image.to_i)
-		else
-			raise ArgumentError, 'invalid image'
-		end.tap {|image|
-			class << image
-				def width
-					C::pix_get_width(self)
-				end
-
-				def height
-					C::pix_get_height(self)
-				end
+		image = suppress_stderr {
+			if image.is_a?(String) && (File.exists?(File.expand_path(image)) rescue nil)
+				C::pix_read(File.expand_path(image))
+			elsif image.is_a?(String)
+				C::pix_read_mem(image, image.bytesize)
+			elsif image.is_a?(IO)
+				C::pix_read_stream(image.to_i)
 			end
-
-			ObjectSpace.define_finalizer image, image_finalizer(image)
 		}
+
+		raise ArgumentError, 'invalid image' if image.nil? || image.null?
+
+		image = FFI::AutoPointer.new(image, method(:image_finalizer))
+
+		class << image
+			def width
+				C::pix_get_width(self)
+			end
+
+			def height
+				C::pix_get_height(self)
+			end
+		end
+
+		image
 	end
 
-	def self.image_finalizer (image) # :nodoc:
-		proc {
-			C::pix_destroy(pointer)
-		}
+	def self.image_finalizer (pointer) # :nodoc:
+		C::pix_destroy(pointer)
 	end
 
 	##
@@ -77,15 +79,11 @@ class API
 	}
 
 	def initialize
-		@internal = C::create
-
-		ObjectSpace.define_finalizer self, self.class.finalizer(to_ffi)
+		@internal = FFI::AutoPointer.new(C::create, self.class.method(:finalizer))
 	end
 
 	def self.finalizer (pointer) # :nodoc:
-		proc {
-			C::destroy(pointer)
-		}
+		C::destroy(pointer)
 	end
 
 	def version

data/lib/tesseract/c.rb

@@ -44,7 +44,7 @@ module C
 
 		cpp.function %{
 			Pix* pix_read_fd (int fd) {
-				return pixReadStream(fdopen(fd, "r"), 0);
+				return pixReadStream(fdopen(fd, "rb"), 0);
 			}
 		}
 

data/lib/tesseract/engine.rb

@@ -22,7 +22,6 @@
 # or implied, of meh.
 #++
 
-require 'namedic'
 require 'tesseract/api'
 
 module Tesseract
@@ -91,20 +90,20 @@ class Engine
 		end
 	}
 
-	def blacklist (what = nil)
-		if what
-			set('tessedit_char_blacklist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s)
-		else
-			get('tessedit_char_blacklist').chars.to_a
-		end
+	def blacklist
+		get('tessedit_char_blacklist').chars.to_a
 	end
 
-	def whitelist (what = nil)
-		if what
-			set('tessedit_char_whitelist', what.respond_to?(:to_a) ? what.to_a.join : what.to_s)
-		else
-			get('tessedit_char_whitelist').chars.to_a
-		end
+	def blacklist= (value)
+		set('tessedit_char_blacklist', value.respond_to?(:to_a) ? value.to_a.join : value.to_s)
+	end
+
+	def whitelist
+		get('tessedit_char_whitelist').chars.to_a
+	end
+
+	def whitelist= (value)
+		set('tessedit_char_whitelist', value.respond_to?(:to_a) ? value.to_a.join : value.to_s)
 	end
 
 	def page_segmentation_mode

data/lib/tesseract/extensions.rb

@@ -0,0 +1,38 @@
+#--
+# Copyright 2011 meh. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+#
+#    1. Redistributions of source code must retain the above copyright notice, this list of
+#       conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY meh ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL meh OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation are those of the
+# authors and should not be interpreted as representing official policies, either expressed
+# or implied, of meh.
+#++
+
+require 'namedic'
+require 'iso-639'
+
+module Kernel
+	def suppress_stderr
+		old = IO.pipe.last.reopen($stderr)
+
+		$stderr.reopen(IO.pipe.last)
+		result = yield
+		$stderr.reopen(old)
+
+		result
+	end
+end

data/lib/tesseract/version.rb

@@ -24,6 +24,6 @@
 
 module Tesseract
 	def self.version
-		'0.0.1.4'
+		'0.0.2'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tesseract-ocr
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namedic
-  requirement: &14007960 !ruby/object:Gem::Requirement
+  requirement: &10345380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14007960
+  version_requirements: *10345380
 - !ruby/object:Gem::Dependency
   name: iso-639
-  requirement: &14007440 !ruby/object:Gem::Requirement
+  requirement: &10344840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14007440
+  version_requirements: *10344840
 - !ruby/object:Gem::Dependency
   name: ffi-extra
-  requirement: &14006760 !ruby/object:Gem::Requirement
+  requirement: &10341680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14006760
+  version_requirements: *10341680
 - !ruby/object:Gem::Dependency
   name: ffi-inliner
-  requirement: &14005940 !ruby/object:Gem::Requirement
+  requirement: &10340760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14005940
+  version_requirements: *10340760
 description: 
 email: meh@paranoici.org
 executables:
@@ -70,6 +70,7 @@ files:
 - lib/tesseract/api.rb
 - lib/tesseract/c.rb
 - lib/tesseract/engine.rb
+- lib/tesseract/extensions.rb
 - lib/tesseract/version.rb
 - tesseract-ocr.gemspec
 - test/first.png