imageruby 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.2.4 fixed read of pixel data on alpha combinations
+
+      fixed Color#inspect
+
+      fixed require on specs requiring "imageruby" instead of "lib/imageruby"
+
+      fixed encoding of alpha channels on replace_color! method (update to ruby1.9)
+
+      fixed error on alpha decoding when reading ordinal
+
 0.2.1	Fixed compatibility with ruby 1.9 on bitmap representation (Thanks amadanmath!)
 
 0.2.0	Added persistor and loaders

data/Rakefile

@@ -6,7 +6,7 @@ require 'rdoc/task'
 
 spec = Gem::Specification.new do |s|
   s.name = 'imageruby'
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/lib/imageruby/color.rb

@@ -158,6 +158,10 @@ module ImageRuby
         end
       end
 
+      def inspect
+        "\##{sprintf("%02x%02x%02x",r,g,b)}#{a==255?"": a.to_s(16)}"
+      end
+
       define_colors "red" => [255,0,0], "green" => [0,255,0] , "blue" => [0,0,255],
                   "white" => [255,255,255], "silver" => [0xc0, 0xc0, 0xc0], "gray" => [0x80,0x80,0x80],
                   "black" => [0,0,0], "maroon" => [0x80,0,0], "yellow" => [0xff,0xff,0],

data/lib/imageruby/pureruby.rb

@@ -151,22 +151,22 @@ public
           (0..draw_width-1).each do |x_orig|
             color = orig_pixel_data[origpointer..origpointer+2]
 
-              alpha = image.alpha_data[y_orig*image.width+x_orig]
+              alpha = image.alpha_data[y_orig*image.width+x_orig].ord
 
                 if alpha < 255
                   if alpha > 0
                     dest_pixel_data[destpointer] =
-                      ( orig_pixel_data[origpointer]*(alpha) + dest_pixel_data[destpointer]*(255-alpha) ) / 255
+                      (( orig_pixel_data[origpointer].ord*(alpha) + dest_pixel_data[destpointer].ord*(255-alpha) ) / 255).chr
                       origpointer = origpointer + 1
                       destpointer = destpointer + 1
 
                     dest_pixel_data[destpointer] =
-                      ( orig_pixel_data[origpointer]*(alpha) + dest_pixel_data[destpointer]*(255-alpha) ) / 255
+                      (( orig_pixel_data[origpointer].ord*(alpha) + dest_pixel_data[destpointer].ord*(255-alpha) ) / 255).chr
                       origpointer = origpointer + 1
                       destpointer = destpointer + 1
 
                     dest_pixel_data[destpointer] =
-                      ( orig_pixel_data[origpointer]*(alpha) + dest_pixel_data[destpointer]*(255-alpha) ) / 255
+                      (( orig_pixel_data[origpointer].ord*(alpha) + dest_pixel_data[destpointer].ord*(255-alpha) ) / 255).chr
                       origpointer = origpointer + 1
                       destpointer = destpointer + 1
 
@@ -247,7 +247,7 @@ public
       strcolor1 = color1.to_s
       strcolor2 = color2.to_s
 
-      a = color2.a
+      a = color2.a.chr
 
       (0..width*height).each do |i|
         if pixel_data[i*3..i*3+2] == strcolor1 then

data/spec/color_spec.rb

@@ -1,4 +1,4 @@
-require "lib/imageruby"
+require "imageruby"
 
 include ImageRuby
 

data/spec/image_spec.rb

@@ -1,4 +1,4 @@
-require "lib/imageruby"
+require "imageruby"
 
 include ImageRuby
 

data/spec/validation_spec.rb

@@ -1,4 +1,4 @@
-require "lib/imageruby"
+require "imageruby"
 
 include ImageRuby
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imageruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: robertodarioseminara@gmail.com