libis-format 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0fa2347db2ac8e525a5f4d9a2e0dd5b6041c3e
-  data.tar.gz: 4e35f07c555c7535acfd7529fd5cbd5d66d93013
+  metadata.gz: ed9452c366ebd64b7c1816bd64cdf0db34d8da79
+  data.tar.gz: db6860f1a4d4448ba6b4355a3b6e84f75238648d
 SHA512:
-  metadata.gz: 5d3885c3601936d75e4acd3c229ed4157dd44b759632f8b65ea46edc180189d57892f0f0f42050170e269ae0386e9e6cdb0870071a684355d27160b174166be0
-  data.tar.gz: d92986e11cb2d1e4b35f60781d81d4a6a1bc5c7aba1b950abfc9e01f3b862891e4d57c1a5e758681c40fbe98b548980a0825df42471b9061f801c4d4f61951bf
+  metadata.gz: b50c3e2d3e33fab8274de6717ddde01112a99a7487b282b9a5be3178460532a3ec4bb004d883ec498f3b7315a8df104fe57c1242741049e80097bb2c9324805c
+  data.tar.gz: 9e73029ba7b308fc34d599ceb85554b2110581959118b15e6329013b501d06a0d02a75aeabbbd73cbd2aa4821c2c61499cc5bbfb2e0cc9de6ce796aa62501de4

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

@@ -14,12 +14,19 @@ module Libis
 
       class ImageConverter < Libis::Format::Converter::Base
 
-        def self.input_types(format = nil)
+        def self.input_types(_ = nil)
           [:TIFF, :JPG, :PNG, :BMP, :GIF, :JP2, :PDF]
         end
 
-        def self.output_types(_ = nil)
-          [:TIFF, :JPG, :PNG, :BMP, :GIF, :JP2, :PDF]
+        def self.output_types(input_format = nil)
+          case input_format
+            when :JP2
+              [:JP2]
+            when *(input_types - [:JP2])
+              input_types - [:JP2]
+            else
+              []
+          end
         end
 
         def initialize

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

@@ -1,20 +1,16 @@
 # encoding: utf-8
-
-require_relative 'base'
-require 'libis/format/identifier'
-
-require 'mini_magick'
+require 'libis-tools'
 require 'fileutils'
+require 'libis/format/config'
 
-MiniMagick.logger.level = ::Logger::ERROR
-
+require_relative 'base'
 module Libis
   module Format
     module Converter
 
       class Jp2Converter < Libis::Format::Converter::Base
 
-        def self.input_types(format = nil)
+        def self.input_types(_ = nil)
           [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF]
         end
 
@@ -102,8 +98,6 @@ module Libis
           )
 
           target
-
-
         end
       end
     end

data/lib/libis/format/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors:
 - Kris Dekeyser