tabula-extractor 0.5.0-java → 0.5.1-java

data/.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+*.swp
 *.gem
 *.rbc
 .bundle

data/ext/Makefile.mingw64

@@ -0,0 +1,10 @@
+include Makefile.defaults
+
+#CC = /usr/local/gcc-4.8.0-qt-4.8.4-for-mingw32/win32-gcc/bin/i586-mingw32-gcc
+CC = /usr/bin/x86_64-w64-mingw32-gcc
+CFLAGS := -Wall -Werror
+
+lib: lib$(NAME).$(VERSION).dll
+
+lib$(NAME).$(VERSION).dll: $(NAME).o 
+	$(CC) -shared -o lib$(NAME)64.dll liblsd.def $^

data/lib/tabula/entities.rb

@@ -99,8 +99,8 @@ module Tabula
 
       # spaces are not detected, b/c they have height == 0
       # ze = ZoneEntity.new(area[0], area[1], area[3] - area[1], area[2] - area[0])
-      # self.texts.select { |t| t.overlaps? ze } 
-      self.texts.select { |t| 
+      # self.texts.select { |t| t.overlaps? ze }
+      self.texts.select { |t|
         t.top > area[0] && t.top + t.height < area[2] && t.left > area[1] && t.left + t.width < area[3]
       }
     end
@@ -152,7 +152,7 @@ module Tabula
       down_tolerance = 0.95
 
       dist = self.horizontal_distance(other).abs
-      
+
       rv = overlaps && (dist.between?(self.width_of_space * down_tolerance, self.width_of_space + up_tolerance))
       rv
     end
@@ -287,20 +287,31 @@ module Tabula
 
       horiz = rulings.select { |r| r.horizontal? && r.width > max_distance }
         .group_by(&:top)
-        .values.reduce([]) { |memo, rs|
-        rs = rs.sort_by(&:left)
-
-        memo << if rs.size > 1
-                  Tabula::Ruling.new(rs[0].top, rs[0].left, rs[-1].right - rs[0].left, 0)
-                else
-                  rs.first
-                end
+        .values.reduce([]) do |memo, rs|
 
-      }
+        rs = rs.sort_by(&:left)
+        if rs.size > 1
+          memo +=
+            rs.each_cons(2)
+            .chunk { |p| p[1].left - p[0].right < 7 }
+            .select { |c| c[0] }
+            .map { |group|
+            group = group.last.flatten.uniq
+            Tabula::Ruling.new(group[0].top,
+                               group[0].left,
+                               group[-1].right - group[0].left,
+                               0)
+          }
+          Tabula::Ruling.new(rs[0].top, rs[0].left, rs[-1].right - rs[0].left, 0)
+        else
+          memo << rs.first
+        end
+        memo
+      end
       .sort_by(&:top)
 
       h = []
-      horiz.size.times do |i| 
+      horiz.size.times do |i|
 
         if i == horiz.size - 1
           h << horiz[-1]
@@ -308,7 +319,7 @@ module Tabula
         end
 
         if skip
-          skip = false; 
+          skip = false;
           next
         end
         d = (horiz[i+1].top - horiz[i].top).abs
@@ -324,41 +335,55 @@ module Tabula
 
       vert = rulings.select { |r| r.vertical? && r.height > max_distance }
         .group_by(&:left)
-        .values.reduce([]) { |memo, rs|
-
-        rs = rs.sort_by(&:top)
-        memo << if rs.size > 1
-                  Tabula::Ruling.new(rs[0].top, rs[0].left, 0, rs[-1].bottom - rs[0].top)
-                else rs.first
-                  rs.first
-                end
-        }
-        .sort_by(&:left)
-      
-      v = []
-      vert.size.times do |i|
-        
-        if i == vert.size - 1
-          v << vert[-1]
-          break
-        end
-
-        if skip
-          skip = false; 
-          next
-        end
-        d = (vert[i+1].left - vert[i].left).abs
+        .values
+        .reduce([]) do |memo, rs|
+
+          rs = rs.sort_by(&:top)
+
+          if rs.size > 1
+            # Here be dragons:
+            # merge consecutive segments of lines that are close enough
+            memo +=
+              rs.each_cons(2)
+              .chunk { |p| p[1].top - p[0].bottom < 7 }
+              .select { |c| c[0] }
+              .map { |group|
+                group = group.last.flatten.uniq
+                Tabula::Ruling.new(group[0].top,
+                                   group[0].left,
+                                   0,
+                                   group[-1].bottom - group[0].top)
+              }
+         else
+           memo << rs.first
+         end
+         memo
+      end.sort_by(&:left)
+
+      # v = []
+
+      # vert.size.times do |i|
+      #   if i == vert.size - 1
+      #     v << vert[-1]
+      #     break
+      #   end
+
+      #   if skip
+      #     skip = false;
+      #     next
+      #   end
+      #   d = (vert[i+1].left - vert[i].left).abs
+
+      #   v << if d < 4 # THRESHOLD DISTANCE between vertical lines
+      #          skip = true
+      #          Tabula::Ruling.new([vert[i+1].top, vert[i].top].min, vert[i].left + d / 2, 0, [vert[i+1].height.abs, vert[i].height.abs].max)
+      #        else
+      #          vert[i]
+      #        end
+      # end
+      # vert = v
 
-        v << if d < 4 # THRESHOLD DISTANCE between vertical lines
-               skip = true
-               Tabula::Ruling.new([vert[i+1].top, vert[i].top].min, vert[i].left + d / 2, 0, [vert[i+1].height.abs, vert[i].height.abs].max)
-             else
-               vert[i]
-             end
-      end
-      vert = v
 
-      
       # - only keep horizontal rulings that intersect with at least one vertical ruling
       # - only keep vertical rulings that intersect with at least one horizontal ruling
       # yeah, it's a naive heuristic. but hey, it works.

data/lib/tabula/line_segment_detector.rb

@@ -16,7 +16,11 @@ module Tabula
     extend FFI::Library
     ffi_lib File.expand_path('../../ext/' + case RbConfig::CONFIG['host_os']
                                             when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-                                              'liblsd.dll'
+                                              if RbConfig::CONFIG['host_cpu'] == 'x86_64'
+                                                'liblsd64.dll'
+                                              else
+                                                'liblsd.dll'
+                                              end
                                             when /darwin|mac os/
                                               'liblsd.dylib'
                                             when /linux/
@@ -33,16 +37,27 @@ module Tabula
     attach_function :lsd, [ :pointer, :buffer_in, :int, :int ], :pointer
     attach_function :free_values, [ :pointer ], :void
 
-    def LSD.detect_lines_in_pdf_page(pdf_path, page_number, scale_factor=1)
+    DETECT_LINES_DEFAULTS = {
+      :scale_factor => nil,
+      :image_size => 2048
+    }
+
+    def LSD.detect_lines_in_pdf_page(pdf_path, page_number, options={})
+      options = DETECT_LINES_DEFAULTS.merge(options)
+
       pdf_file = PDDocument.loadNonSeq(java.io.File.new(pdf_path), nil)
-      bi = Tabula::Render.pageToBufferedImage(pdf_file.getDocumentCatalog.getAllPages[page_number - 1])
+      page = pdf_file.getDocumentCatalog.getAllPages[page_number - 1]
+      bi = Tabula::Render.pageToBufferedImage(page,
+                                              options[:image_size])
       pdf_file.close
-      detect_lines(bi,scale_factor)
+      detect_lines(bi,
+                   options[:scale_factor] || (page.findCropBox.width / options[:image_size]))
     end
 
     # image can be either a string (path to image) or a Java::JavaAwtImage::BufferedImage
     # image to pixels: http://stackoverflow.com/questions/6524196/java-get-pixel-array-from-image
     def LSD.detect_lines(image, scale_factor=1)
+
       bimage = if image.class == Java::JavaAwtImage::BufferedImage
                  image
                elsif image.class == String

data/lib/tabula/version.rb

@@ -1,3 +1,3 @@
 module Tabula
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -2,14 +2,14 @@
 name: tabula-extractor
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.5.0
+  version: 0.5.1
 platform: java
 authors:
 - Manuel Aristarán
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -84,11 +84,13 @@ files:
 - ext/Makefile.linux32
 - ext/Makefile.linux64
 - ext/Makefile.mingw
+- ext/Makefile.mingw64
 - ext/liblsd-linux32.so
 - ext/liblsd-linux64.so
 - ext/liblsd.def
 - ext/liblsd.dll
 - ext/liblsd.dylib
+- ext/liblsd64.dll
 - ext/lsd.c
 - ext/lsd.h
 - lib/tabula.rb