ico 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a012e50b4d328b067cd6bc6c8eb90e88cd1b5b6
-  data.tar.gz: 8a2da2df36d786586806871a0e205e0cacb1acdb
+  metadata.gz: ea80756d32854345ffc3a3470ea0d2a2ec4ebb66
+  data.tar.gz: 7c5df1dc0e7318d78daee2b5d9f17d94a70fa564
 SHA512:
-  metadata.gz: e6c9f22a4bfe78001d2c80c852943639d82b6e1c5062a585835293d1fdbe7a07c7e82e753799b7de92eaca3e51f46172432caf59bbfaacc113f36476c50677c7
-  data.tar.gz: 77512c9b61c7268f65cdd434bc0e3d8d4cd64636efc9225672a456df8f6173b0d206d61629d4f1f9843e9ba2a2c97af5939cbc46af5f068a81aef88be6faa41c
+  metadata.gz: e48056d32d636cdeb946c1d32703f09242005d897e1fe102d32db95804678340349ed46d54735895dbc9647612a9f4e03bcad7bee3e9ce8ded7c8c7abfb0120f
+  data.tar.gz: 37ccca7ab65758e2895c5bceb265b5921cb7bb01ba8a015dcae40facfc119d4dcc2acf6abdb6f1c08bf8925736d8c86a030dcdae735ef2049eb4708b8a656688

data/ico.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ico 0.1.1 ruby lib
+# stub: ico 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ico"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["So Awesome Man"]
-  s.date = "2017-04-02"
+  s.date = "2017-04-03"
   s.description = "ICO file format in Ruby"
   s.email = "support@bordee.com"
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "History.txt"]

data/lib/ico.rb

@@ -45,28 +45,28 @@ module ICO
       img                 = ChunkyPNG::Image.from_file(fn)
       #img_hash            = BMP::Utils.parse_image(img, ICO::IconImage::HEADER_SIZE_IN_BYTES)
       img_hash            = BMP::Utils.parse_image(img)
-      file_size           = img_hash[:image_size] + ICO::IconImage::HEADER_SIZE_IN_BYTES
+      mask_size           = img_hash[:image_width] * 4
+      mask                = "\x00\x00\x00\x00" * img_hash[:image_width]
+      image_size          = (img_hash[:image_width] * img_hash[:image_height] * 4) + mask_size
+      file_size           = image_size + ICO::IconImage::HEADER_SIZE_IN_BYTES 
 
       entry               = entries[i]
-      image               = images[i]
-
       entry.width         = img_hash[:image_width] 
       entry.height        = img_hash[:image_height] 
-      #entry.bytes_in_res  = img_hash[:file_size] 
       entry.bytes_in_res  = file_size
       entry.image_offset  = offset
 
+      image               = images[i]
       image.width         = img_hash[:image_width]
       image.height        = (img_hash[:image_height] * 2)
-      image.size_image    = img_hash[:image_size]  
-      image.data          = img_hash[:pixel_array] 
+      image.size_image    = image_size
+      image.data          = img_hash[:pixel_array] + mask
 
-      #offset              += img_hash[:file_size]
       offset              += file_size
     end
 
     # IconDirEntry + IconImage section as binary data string
-    icon_dir.data         = entries.join + images.join
+    icon_dir.data         =  entries.join + images.join
 
     icon_dir
   end

data/lib/ico/icon_image.rb

@@ -12,8 +12,8 @@ module ICO
     unsigned  :bit_count,             16, nil,  :default => 32
     unsigned  :compression,           32, nil,  :default => 0
     unsigned  :size_image,            32
-    unsigned  :x_pixels_per_meter,    32, nil,  :default => 5669
-    unsigned  :y_pixels_per_meter,    32, nil,  :default => 5669
+    unsigned  :x_pixels_per_meter,    32, nil,  :default => 0
+    unsigned  :y_pixels_per_meter,    32, nil,  :default => 0
     unsigned  :colors_used,           32, nil,  :default => 0
     unsigned  :colors_important,      32, nil,  :default => 0
 

data/lib/ico/version.rb

@@ -1,3 +1,3 @@
 module ICO
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ico
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - So Awesome Man
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png