libis-format 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86362989ffe452b37e82bc647c5abebc480d2a5f
-  data.tar.gz: d9d19fd300c54b12e26a2c0b1dcce7416452fe55
+  metadata.gz: ca0fa2347db2ac8e525a5f4d9a2e0dd5b6041c3e
+  data.tar.gz: 4e35f07c555c7535acfd7529fd5cbd5d66d93013
 SHA512:
-  metadata.gz: 42eb64630ab74678939d4e9b7144296c20f803fe48aef907d1e28dac329f96607442a5b1286eded9729fe9005d7f6cac7b094767b0bc2f51c1c9a29c77470b44
-  data.tar.gz: cbc01c829480e78cbb15b1d0905aa3b9823b148084ddbab4d0aae9d9a76fcb86bb8ab9dcfe35cea2e3f2a2d1f6280c0ca89f6818bd88a3e1e5a01d7550039c73
+  metadata.gz: 5d3885c3601936d75e4acd3c229ed4157dd44b759632f8b65ea46edc180189d57892f0f0f42050170e269ae0386e9e6cdb0870071a684355d27160b174166be0
+  data.tar.gz: d92986e11cb2d1e4b35f60781d81d4a6a1bc5c7aba1b950abfc9e01f3b862891e4d57c1a5e758681c40fbe98b548980a0825df42471b9061f801c4d4f61951bf

data/lib/libis/format/config.rb

@@ -10,6 +10,7 @@ module Libis
     Config[:converter_chain_max_level] = 8
 
     Config[:java_path] = 'java'
+    Config[:j2kdriver] = 'j2kdriver'
     Config[:soffice_path] = 'soffice'
     Config[:ghostscript_path] = 'gs'
     # Config[:pdfa_path] =

data/lib/libis/format/converter/image_converter.rb

@@ -59,8 +59,12 @@ module Libis
           @options[:colorspace] = value
         end
 
+        def delete_date
+          @delete_date = true
+        end
+
         def profile(icc)
-          @options[:profile] = icc
+          @profile = icc
         end
 
         # Create or use a watermark image.
@@ -186,12 +190,6 @@ module Libis
               convert.resize("#{image.width / @wm_size}x#{image.height / @wm_size}").write('mpr:watermark').delete.+
             end
 
-            conversions = {}
-            icc_options = {}
-            @options.each do |o, v|
-              ([:colorspace, :profile].include?(o) ? icc_options : conversions)[o] = v
-            end
-
             convert << source
             convert.flatten if format == :JPG
             if @wm_image
@@ -206,13 +204,16 @@ module Libis
             end
 
             @flags.each { |f, v| v.is_a?(FalseClass) ? convert.send(f).+ : convert.send(f) }
+            if @delete_date
+              convert << '+set' << 'modify-date' <<  '+set' << 'create-date'
+            end
 
-            unless conversions.empty?
+            unless @options.empty?
               convert.colorspace('RGB')
-              conversions.each { |o, v| convert.send(o, v) }
-              convert.colorspace('sRGB') if icc_options.empty?
+              @options.each { |o, v| convert.send(o, v) }
+              convert.colorspace('sRGB') unless @options[:colorspace]
             end
-            icc_options.each { |o, v| convert.send(o, v) }
+            convert.profile @profile if @profile
 
             convert.format(format)
             convert << target

data/lib/libis/format/converter/jp2_converter.rb

@@ -0,0 +1,111 @@
+# encoding: utf-8
+
+require_relative 'base'
+require 'libis/format/identifier'
+
+require 'mini_magick'
+require 'fileutils'
+
+MiniMagick.logger.level = ::Logger::ERROR
+
+module Libis
+  module Format
+    module Converter
+
+      class Jp2Converter < Libis::Format::Converter::Base
+
+        def self.input_types(format = nil)
+          [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF]
+        end
+
+        def self.output_types(_ = nil)
+          [:JP2]
+        end
+
+        def initialize
+          super
+          @options = {
+              color_xform: false,
+              error_resilience: :ALL,
+              lossless: true,
+              progression_order: 'RLCP',
+              tile_size: [1024, 1024],
+              codeblock_size: [6, 6],
+          }
+        end
+
+        def j2kdriver(_)
+          #force usage of this converter
+        end
+
+        def color_xform(flag = true)
+          @options[:color_xform] = flag
+        end
+
+        def error_resilience(value = :ALL)
+          @options[:error_resilience] = value
+        end
+
+        def lossless(value = true)
+          @options[:lossless] = value
+        end
+
+        def progression_order(value = 'RLCP')
+          @options[:progression_order] = value
+        end
+
+        def tile_size(width = 1024, height = 1024)
+          @options[:tile_size] = [width, height]
+        end
+
+        def codeblock_size(height = 6, width = 6)
+          @options[:codeblock_size] = [height, width]
+        end
+
+        def convert(source, target, format, opts = {})
+          super
+
+          FileUtils.mkpath(File.dirname(target))
+
+          options = []
+
+          @options.each do |key, value|
+            case key
+              when :color_xform
+                options << '--set-output-j2k-color-xform' << value ? 'YES' : 'NO'
+              when :error_resilience
+                options << '--set-output-j2k-error-resilience' << value.to_s
+              when :lossless
+                if value
+                  options << '--set-output-j2k-xform' << 'R53' << '5' << '--set-output-j2k-ratio' << '0'
+                else
+                  options << '--set-output-j2k-xform' << 'I97' << '--set-output-j2k-psnr' << '46'
+                end
+              when :progression_order
+                options << '--set-output-j2k-progression-order' << value.to_s
+              when :tile_size
+                options << '--set-output-j2k-tile-size' << value[0].to_s << value[1].to_s
+              when :codeblock_size
+                options << '--set-output-j2k-codeblock-size' << value[0].to_s << value[1].to_s
+              else
+                #do nothing
+            end
+          end
+
+
+          Libis::Tools::Command.run(
+              Libis::Format::Config[:j2kdriver],
+              '--input-file-name', source,
+              '--output-file-name', target,
+              '--set-output-type', 'JP2',
+              *options
+          )
+
+          target
+
+
+        end
+      end
+    end
+  end
+end

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.20'
+    VERSION = '0.9.21'
   end
 end

data/spec/converter_spec.rb

@@ -83,9 +83,11 @@ describe 'Converters' do
       ref_file = File.join(file_dir, 'data', 'test.jpg')
       tgt_file = File.join('', 'tmp', 'test.jpg')
       FileUtils.mkdir_p File.dirname(tgt_file)
+      converter.delete_date
       result = converter.convert(src_file, tgt_file, :JPG)
       expect(result).to eq tgt_file
-      expect(tgt_file).to be_same_file_as ref_file
+      compare = MiniMagick::Tool::Compare.new { |cmp| cmp << '-metric' << 'mae' << ref_file << tgt_file << 'null:' }
+      expect(compare).to_not be_nil
       FileUtils.rm tgt_file, force: true
     end
 
@@ -94,9 +96,11 @@ describe 'Converters' do
       ref_file = File.join(file_dir, 'data', 'test.png')
       tgt_file = File.join('', 'tmp', 'test.png')
       FileUtils.mkdir_p File.dirname(tgt_file)
+      converter.delete_date
       result = converter.convert(src_file, tgt_file, :PNG)
       expect(result).to eq tgt_file
-      expect(tgt_file).to be_same_file_as ref_file
+      compare = MiniMagick::Tool::Compare.new { |cmp| cmp << '-metric' << 'mae' << ref_file << tgt_file << 'null:' }
+      expect(compare).to_not be_nil
       FileUtils.rm tgt_file, force: true
     end
 
@@ -105,6 +109,7 @@ describe 'Converters' do
       ref_file = File.join(file_dir, 'data', 'test.pdf.tif')
       tgt_file = File.join('', 'tmp', 'test.pdf.tif')
       FileUtils.mkdir_p File.dirname(tgt_file)
+      converter.delete_date
       result = converter.convert(src_file, tgt_file, :TIFF)
       expect(result).to eq tgt_file
       expect(tgt_file).to be_same_file_as ref_file
@@ -117,9 +122,11 @@ describe 'Converters' do
       tgt_file = File.join('', 'tmp', 'test-options.jpg')
       FileUtils.mkdir_p File.dirname(tgt_file)
       converter.watermark(text: 'RSPEC', size: 5, opacity: 0.1, rotation: 15, gap: 0.5, composition: 'modulate')
+      converter.delete_date
       result = converter.convert(src_file, tgt_file, :JPG, options: {scale: '150%', quality: '70%'})
       expect(result).to eq tgt_file
-      expect(tgt_file).to be_same_file_as ref_file
+      compare = MiniMagick::Tool::Compare.new { |cmp| cmp << '-metric' << 'mae' << ref_file << tgt_file << 'null:' }
+      expect(compare).to_not be_nil
       FileUtils.rm tgt_file, force: true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,7 @@ files:
 - lib/libis/format/converter/base.rb
 - lib/libis/format/converter/chain.rb
 - lib/libis/format/converter/image_converter.rb
+- lib/libis/format/converter/jp2_converter.rb
 - lib/libis/format/converter/office_converter.rb
 - lib/libis/format/converter/pdf_converter.rb
 - lib/libis/format/converter/repository.rb