libis-format 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d209bde1a85973e528730bb3ec4c9cffc58db02f916936fa2144d4e91b81f7
-  data.tar.gz: 04315d80c7e20b6302f9d6d10906f4ec7d5b6046a47902fbeff95ec97bf7732a
+  metadata.gz: 7cad4173d3e5cc43e573f612cc3f345ef91f5eb8938bb0d457681514d281a531
+  data.tar.gz: 77e84828a1269bb9ddd153362a8af2221153494542f328b73785d014740e07e1
 SHA512:
-  metadata.gz: d581e3ac51fc290ba57e27d2bf6bfe5dcfa8f269a8dbdfa656954bff2af7efd8d963177ec1cb309db481bd7b84603df20e8b34bb1800f7c88d93e91e31722532
-  data.tar.gz: 867208ce1766cb4bdec0efc648c7b5a1e1dd9883ffd5818f82324ea3a783b21e50cb81fafdbc04bad1c1da75adb75503c63d9be3936baeeac436a5a92ac9a791
+  metadata.gz: 1cc76923e13c732a606af376614b9d2dd716e7ff851a77645bc8fd979ee7d7c6e98c5bd9936ea506f68009c1aba71b94be98a558e7b4167e53011d966a099c2e
+  data.tar.gz: 29c46dc0a855ff168d2160cd9934e6a710d98e1ddea3b06ae47413248f3d1ddc288bbf376a89a85505ca10cba6d3b3b1d80b4f50f8a1545389b9671f9a0fa46d

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

@@ -128,12 +128,12 @@ module Libis
           opts[:output] << '-map_metadata:g' << '0:g' # Copy global metadata
           opts[:output] << '-map_metadata:s:a' << '0:s:a' # Copy audio metadata
           opts[:input] << '-accurate_seek' << (@options[:start].to_i < 0 ? '-sseof' : '-ss') << @options[:start] if @options[:start]
-          opts[:input] << '-t' << @options[:duration] if @options[:duration]
-          opts[:output] << '-q:a' << @options[:quality] if @options[:quality]
-          opts[:output] << '-b:a' << @options[:bit_rate] if @options[:bit_rate]
-          opts[:output] << '-ar' << @options[:sampling_freq] if @options[:sampling_freq]
-          opts[:output] << '-ac' << @options[:channels] if @options[:channels]
-          opts[:output] << '-f' << @options[:format] if @options[:format]
+          opts[:input] << '-t' << @options[:duration].to_s if @options[:duration]
+          opts[:output] << '-q:a' << @options[:quality].to_s if @options[:quality]
+          opts[:output] << '-b:a' << @options[:bit_rate].to_s if @options[:bit_rate]
+          opts[:output] << '-ar' << @options[:sampling_freq].to_s if @options[:sampling_freq]
+          opts[:output] << '-ac' << @options[:channels].to_s if @options[:channels]
+          opts[:output] << '-f' << @options[:format].to_s if @options[:format]
           result = Libis::Format::Tool::FFMpeg.run(source, target, opts)
           info "FFMpeg output: #{result}"
           result

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

@@ -130,7 +130,7 @@ module Libis
             colorspace = @options.delete(:colorspace) || 'sRGB'
             unless @options.empty?
               convert.colorspace('RGB')
-              @options.each {|o, v| convert.send(o, v)}
+              @options.each {|o, v| convert.send(o, v.to_s)}
             end
             convert.colorspace(colorspace)
             convert.profile @profile if @profile

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

@@ -51,11 +51,13 @@ module Libis
           @options[:progression_order] = value
         end
 
-        def tile_size(width = 1024, height = 1024)
+        def tile_size(width = 1024, height = nil)
+          height ||= width
           @options[:tile_size] = [width, height]
         end
 
-        def codeblock_size(height = 6, width = 6)
+        def codeblock_size(width = 6, height = nil)
+          height ||= width
           @options[:codeblock_size] = [height, width]
         end
 

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

@@ -63,7 +63,7 @@ module Libis
                   if v.nil?
                     nil
                   else
-                    ["--#{k}", v]
+                    ["--#{k}", v.to_s]
                   end}.compact.flatten
             )
             unless result[:err].empty?

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

@@ -103,7 +103,7 @@ module Libis
                     nil
                   else
                     k = OPTIONS_TABLE[k] || k
-                    ["--#{k}", v]
+                    ["--#{k}", v.to_s]
                   end
                 },
                 @flags.map { |k, v|

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

@@ -40,9 +40,9 @@ module Libis
         def ranges(selection)
           case selection
           when Array
-            @options[:ranges] += selection unless selection.empty?
+            @options[:ranges] += selection.to_s unless selection.empty?
           when String
-            range(selection)
+            range([selection])
           else
             # nothing
           end

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

@@ -52,7 +52,7 @@ module Libis
               if v.nil?
                 nil
               else
-                ["--#{k}", v]
+                ["--#{k}", v.to_s]
               end }.compact.flatten
           )
           unless result[:err].empty?

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

@@ -51,7 +51,7 @@ module Libis
                   if v.nil?
                     nil
                   else
-                    ["--#{k}", v]
+                    ["--#{k}", v.to_s]
                   end
                   }.compact.flatten
             )

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

@@ -56,7 +56,7 @@ module Libis
                   if v.nil?
                     nil
                   else
-                    ["--#{k}", v]
+                    ["--#{k}", v.to_s]
                   end
                   }.compact.flatten + [@file]
             )

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

@@ -73,7 +73,7 @@ module Libis
                   if v.nil?
                     nil
                   else
-                    ["--#{k}", v]
+                    ["--#{k}", v.to_s]
                   end
                   }.compact.flatten + @text
             )

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

@@ -31,7 +31,7 @@ module Libis
         end
 
         def audio_channels(value)
-          @options[:audio_channels] = value.to_s
+          @options[:audio_channels] = value
         end
 
         def audio_codec(codec)
@@ -43,39 +43,39 @@ module Libis
         end
 
         def start(seconds)
-          @options[:start] = seconds.to_s
+          @options[:start] = seconds
         end
 
         def duration(seconds)
-          @options[:duration] = seconds.to_s
+          @options[:duration] = seconds
         end
 
         def audio_quality(value)
-          @options[:audio_quality] = value.to_s
+          @options[:audio_quality] = value
         end
 
         def video_quality(value)
-          @options[:video_quality] = value.to_s
+          @options[:video_quality] = value
         end
 
         def audio_bitrate(value)
-          @options[:audio_bitrate] = value.to_s
+          @options[:audio_bitrate] = value
         end
 
         def video_bitrate(value)
-          @options[:video_bitrate] = value.to_s
+          @options[:video_bitrate] = value
         end
 
         def constant_rate_factor(value)
-          @options[:crf] = value.to_s
+          @options[:crf] = value
         end
 
         def frame_rate(value)
-          @options[:frame_rate] = value.to_s
+          @options[:frame_rate] = value
         end
 
         def sampling_freq(value)
-          @options[:sampling_freq] = value.to_s
+          @options[:sampling_freq] = value
         end
 
         def scale(width_x_height)
@@ -239,21 +239,21 @@ module Libis
                 ] if @options[:watermark_text_shadow_offset] > 0
             opts[:filter] << '-vf' << filter_text
           end
-          opts[:output] << '-ac' << @options[:audio_channels] if @options[:audio_channels]
-          opts[:output] << '-c:a' << @options[:audio_codec] if @options[:audio_codec]
-          opts[:output] << '-c:v' << @options[:video_codec] if @options[:video_codec]
-          opts[:output] << '-b:a' << @options[:audio_bitrate] if @options[:audio_bitrate]
-          opts[:output] << '-b:v' << @options[:video_bitrate] if @options[:video_bitrate]
-          opts[:output] << '-crf' << @options[:crf] if @options[:crf]
+          opts[:output] << '-ac' << @options[:audio_channels].to_s if @options[:audio_channels]
+          opts[:output] << '-c:a' << @options[:audio_codec].to_s if @options[:audio_codec]
+          opts[:output] << '-c:v' << @options[:video_codec].to_s if @options[:video_codec]
+          opts[:output] << '-b:a' << @options[:audio_bitrate].to_s if @options[:audio_bitrate]
+          opts[:output] << '-b:v' << @options[:video_bitrate].to_s if @options[:video_bitrate]
+          opts[:output] << '-crf' << @options[:crf].to_s if @options[:crf]
           opts[:output] << '-map_metadata:g' << '0:g' # Copy global metadata
           opts[:output] << '-map_metadata:s:a' << '0:s:a' # Copy audio metadata
           opts[:output] << '-map_metadata:s:v' << '0:s:v' # Copy video metadata
-          opts[:input] << '-accurate_seek' << (@options[:start].to_i < 0 ? '-sseof' : '-ss') << @options[:start] if @options[:start]
-          opts[:input] << '-t' << @options[:duration] if @options[:duration]
-          opts[:output] << '-qscale' << @options[:video_quality] if @options[:video_quality]
-          opts[:output] << '-q:a' << @options[:audio_quality] if @options[:audio_quality]
-          opts[:output] << '-r' << @options[:frame_rate] if @options[:frame_rate]
-          opts[:output] << '-ar' << @options[:sampling_freq] if @options[:sampling_freq]
+          opts[:input] << '-accurate_seek' << (@options[:start].to_i < 0 ? '-sseof' : '-ss') << @options[:start].to_s if @options[:start]
+          opts[:input] << '-t' << @options[:duration].to_s if @options[:duration]
+          opts[:output] << '-qscale' << @options[:video_quality].to_s if @options[:video_quality]
+          opts[:output] << '-q:a' << @options[:audio_quality].to_s if @options[:audio_quality]
+          opts[:output] << '-r' << @options[:frame_rate].to_s if @options[:frame_rate]
+          opts[:output] << '-ar' << @options[:sampling_freq].to_s if @options[:sampling_freq]
           if @options[:scale]
             scale = @options[:scale].split('x')
             width = scale[0]

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake