swf_ruby 0.1.0 → 0.1.1

data/README.md

@@ -51,8 +51,8 @@ Replacing Jpeg in SWF
     $ swf_jpeg_replace samples/sample.swf 623 samples/bg.jpg > samples/sample2.swf
     # <623> is offset to DefineBitsJPEG2 resource getting by 'swf_dump'.
 
-Replacing Jpeg in SWF
----------------------
+Replacing GIF/PNG in SWF
+------------------------
 
     $ swf_lossless_replace samples/sample.swf 120 samples/icon.gif > samples/sample3.swf
     # <120> is offset to DefineBitsLossless2 resource getting by 'swf_dump'.

data/bin/swf_dump

@@ -4,7 +4,11 @@
 
 require 'swf_ruby'
 
-print "Specify swf file path to dump for argument." if ARGV.size != 1
+if ARGV.size != 1
+  print "Specify swf file path to dump for argument.\n"
+  exit
+end
+
 swf = SwfRuby::SwfDumper.new
 swf.open(ARGV[0])
 swf.tags.each_with_index do |tag, i|

data/bin/swf_jpeg_replace

@@ -3,7 +3,10 @@
 # SWF中のJpeg(DefineBitsJpeg2)イメージを差し替える.
 require 'swf_ruby'
 
-print "Specify target swf path, offset to jpeg, new jpeg path for arguments." if ARGV.size != 3
+if ARGV.size != 3
+  print "Specify target swf path, offset to jpeg, new jpeg path for arguments.\n"
+  exit
+end
 
 swf = File.open(ARGV[0], "rb").read
 st = SwfRuby::SwfTamperer.new

data/bin/swf_lossless_replace

@@ -3,7 +3,10 @@
 # SWF中のLossless(DefineBitsLossless2)イメージを差し替える.
 require 'swf_ruby'
 
-print "Specify target swf path, offset to image, new image(png,gif) path for arguments." if ARGV.size != 3
+if ARGV.size != 3
+  print "Specify target swf path, offset to image, new image(png,gif) path for arguments.\n"
+  exit
+end
 
 swf = File.open(ARGV[0], "rb").read
 st = SwfRuby::SwfTamperer.new

data/lib/swf_ruby/swf/bits_lossless2.rb

@@ -18,20 +18,20 @@ module SwfRuby
         image.get_pixels(0, 0, image.columns, image.rows).each_with_index do |pixel,i|
           break if colormap.length > 255
           idx = colormap.index(pixel)
-          if idx then
+          if idx
             data << [idx].pack("C")
           else
             colormap << pixel
             data << [colormap.length-1].pack("C")
           end
-          if (i+1) % image.rows == 0 then
+          if (i+1) % image.columns == 0
             # padding
             data += [0].pack("C") * (4-image.columns&3)
           end
         end
 
         # checking image format by size of colormap
-        if colormap.length > 255 then
+        if colormap.length > 255
           # format=5
           # reset and re-build data_stream without colopmap
           data = ""
@@ -48,7 +48,7 @@ module SwfRuby
           # added colormap before data_stream
           data = colormap.inject("") { |r,c|
             opacity = (MaxRGB-c.opacity) >> ShiftDepth
-            if opacity == 0 then
+            if opacity == 0
               r +=
                 [0].pack("C") +
                 [0].pack("C") +

data/lib/swf_ruby/swf_tamperer.rb

@@ -92,26 +92,53 @@ module SwfRuby
     def repl_lossless2(swf, offset, lossless)
       swf.force_encoding("ASCII-8BIT") if swf.respond_to? :force_encoding
 
+      org_format = swf[offset+8, 1].unpack("C").first
       # replace lossless2 data
       if lossless.format == 3
-        org_image_length = swf[offset+2, 4].unpack("i").first - 8
-        swf[offset+14, org_image_length] = lossless.zlib_bitmap_data
-        swf[offset+13, 1] = [lossless.color_table_size].pack("C")
-        swf[offset+11, 2] = [lossless.width].pack("v")
-        swf[offset+9, 2] = [lossless.height].pack("v")
-        swf[offset+8, 1] = [lossless.format].pack("C")
-        swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 8].pack("i")
+        if org_format == 3
+          org_image_length = swf[offset+2, 4].unpack("i").first - 8
+          delta_length = lossless.zlib_bitmap_data.size - org_image_length
+          swf[offset+14, org_image_length] = lossless.zlib_bitmap_data
+          swf[offset+13, 1] = [lossless.color_table_size].pack("C")
+          swf[offset+11, 2] = [lossless.height].pack("v")
+          swf[offset+9, 2] = [lossless.width].pack("v")
+          swf[offset+8, 1] = [lossless.format].pack("C")
+          swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 8].pack("i")
+        elsif org_format == 5
+          org_image_length = swf[offset+2, 4].unpack("i").first - 7
+          delta_length = lossless.zlib_bitmap_data.size - org_image_length + 1
+          swf[offset+13, org_image_length] = [lossless.color_table_size].pack("C") + lossless.zlib_bitmap_data
+          swf[offset+11, 2] = [lossless.height].pack("v")
+          swf[offset+9, 2] = [lossless.width].pack("v")
+          swf[offset+8, 1] = [lossless.format].pack("C")
+          swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 8].pack("i")
+        else
+          raise ReplaceTargetError
+        end
       elsif format == 5
-        org_image_length = swf[offset+2, 4].unpack("i").first - 7
-        swf[offset+13, org_image_length] = lossless.zlib_bitmap_data
-        swf[offset+11, 2] = [lossless.width].pack("v")
-        swf[offset+9, 2] = [lossless.height].pack("v")
-        swf[offset+8, 1] = [lossless.format].pack("C")
-        swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 7].pack("i")
+        if org_format == 3
+          org_image_length = swf[offset+2, 4].unpack("i").first - 8
+          delta_length = lossless.zlib_bitmap_data.size - org_image_length - 1
+          swf[offset+13, org_image_length+1] = lossless.zlib_bitmap_data
+          swf[offset+11, 2] = [lossless.height].pack("v")
+          swf[offset+9, 2] = [lossless.width].pack("v")
+          swf[offset+8, 1] = [lossless.format].pack("C")
+          swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 7].pack("i")
+        elsif org_format == 5
+          org_image_length = swf[offset+2, 4].unpack("i").first - 7
+          delta_length = lossless.zlib_bitmap_data.size - org_image_length
+          swf[offset+13, org_image_length] = lossless.zlib_bitmap_data
+          swf[offset+11, 2] = [lossless.height].pack("v")
+          swf[offset+9, 2] = [lossless.width].pack("v")
+          swf[offset+8, 1] = [lossless.format].pack("C")
+          swf[offset+2, 4] = [lossless.zlib_bitmap_data.size + 7].pack("i")
+        else
+          raise ReplaceTargetError
+        end
       else
         raise ReplaceTargetError
       end
-
+      swf[4, 4] = [swf[4, 4].unpack("V").first + delta_length].pack("V")
       swf
     end
   end

data/lib/swf_ruby/version.rb

@@ -1,3 +1,3 @@
 module SwfRuby
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: []