simple_bmp 0.1.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d84f668c6933430316c3ac409ecc577b7fb71924
-  data.tar.gz: cf46732f084471b98c9f106fedfa781451b6e432
+  metadata.gz: 8d90d75b6ec1571cd0aa6d6d07e6ad2972564fa2
+  data.tar.gz: 39a0f5d31d5d4cca1365ab592d4d90a2ee7eab1b
 SHA512:
-  metadata.gz: 66d1d770f7bbd94fb8b36356f0c9c77d1871d2ca8ec1f720283126dca9a892257f2f41774d26d185fa5ee45714dfe63536b3c7c621f7b5a764a83feaa512d7ed
-  data.tar.gz: 97ecd52f84f73ef570d0dbdadfe5359b6ef5fc87875b6786c8b475724f68d9be75a922240eb395ca723b5d7e378fee722c95eeb3d973d2240a2edf8196313cf6
+  metadata.gz: 6233ec72c8fc2677c092d531733d0d6edf07b221ba310318cf741985490426167f6de16dbd4be3f96a01cc6609b20bdba1ba0ff0aefa58fe0d8e592a25972211
+  data.tar.gz: c92b8b2d761bc83cb8670e7505e064b6ad1872b6b19b5d0cf84944b2849628e6740d63abd6e81e3eda695c670d576767ad8314ea436799aab49ffbb497b41c23

data/lib/simple_bmp.rb

@@ -1,61 +1,72 @@
-##
-# Currently there are no need of classes -- just a single public module method.
-#
+# Currently there are no need of classes -- just a single public module method.  
+# We use only BITMAPCOREHEADER[http://en.wikipedia.org/wiki/BMP_file_format] (12 bytes), because it's enough.
 
 module SimpleBMP
 
-    ##
-    # Pixels is either two or three dimensional array:
-    #   pixels: [height x width x 3] of 0..255 for RGB
-    #   pixels: [height x width] of 0..255 for grayscale
+    # http://stackoverflow.com/a/12925407/322020
+    @@align4 = ->_{ (_ + 3) / 4 * 4 }
+
+    # \+pixels+ is either two or three dimensional array:
+    #   [height x width x 3] of 0..255 for RGB
+    #   [height x width] of 0..255 for grayscale
     # Two-dimensional will be processed as it's three, where R, G anb B are equal.
     #
     # Examples of exporting a single pixel image which is almost gray:
     #   export [[100]], "temp.bmp"
     #   export [[[90,100,110]]], "temp.bmp"
-    #--
-    # we use BITMAPINFOHEADER (40 bytes), because BITMAPCOREHEADER (12 bytes) can't 1 channel
 
     def self.export pixels, filename = "temp.bmp"
         bitmap_width = pixels.first.size
         bitmap_height = pixels.size
-=begin
---
-        hsv2bgr = lambda do |(h,s,v)|
-            a = (v - vmin = (100-s)*v/100)*(h % 60)/60.0
-            vinc, vdec = vmin + a, v - a
-            case h/60
-            when 0 ; [vmin, vinc, v]
-            when 1 ; [vmin, v, vdec]
-            when 2 ; [vinc, v, vmin]
-            when 3 ; [v, vdec, vmin]
-            when 4 ; [v, vmin, vinc]
-            when 5 ; [vdec, vmin, v]
-            end.map{ |i| (2.55 * i).floor }
-        end
-=end
         pixel_array = pixels.reverse.flat_map do |row|
-            #--
             # row_bytes = row.map(&hsv2bgr).flatten
-            row_bytes = row.flat_map{ |pixel| pixel.is_a?(Array) ? pixel : [pixel]*3 }
-            row_bytes.fill 0, row_bytes.size .. (row_bytes.size + 3) / 4 * 4 - 1
+            row_bytes = row.flat_map{ |pixel| pixel.is_a?(Array) ? pixel.reverse : [pixel]*3 }
+            row_bytes.fill 0, row_bytes.size .. @@align4[row_bytes.size] - 1
         end
 
-        #--
         # 12=>BITMAPCOREHEADER, 40=>BITMAPINFOHEADER
         dib_header_size = 12
         file_size = 14 + dib_header_size + pixel_array.size
 
         open(filename, "wb") do |file|
-            #--
             # Bitmap file header
             file.write ["BM", file_size, 14 + dib_header_size].pack "A2qi" # "A2QL"
-            #--
             # DIB header
             # file.write [dib_header_size, bitmap_width, bitmap_height, 1, 24].pack "LllSS"
-            # file.write [0, 0, 1, 1, 0, 0].pack "LLllLL"
+            # file.write [0, 0, 1, 1, 0, 0].pack "LLllLL" # BITMAPINFOHEADER
             file.write [dib_header_size, bitmap_width, bitmap_height, 1, 24].pack "LSSSS"
             file.write pixel_array.pack "C*"
         end
     end
+    
+    # This imports BITMAPCOREHEADER headed RGB bmp images returning a 3-dimentional array.
+
+    def self.import filename = "temp.bmp"
+        File.open(filename, "rb") do |file|
+            _, _, shift = file.read(14).unpack("A2qi")
+            dib_header_size, bitmap_width, bitmap_height = file.read(8).unpack("LSS")
+            fail "can import only BITMAPCOREHEADER (12 bytes)" unless dib_header_size == 12
+            file.pos = shift
+            (file.read(bitmap_height * @@align4[bitmap_width * 3]).unpack("C*")).each_slice(@@align4[bitmap_width * 3]).map do |row|
+                row.each_slice(3).take(bitmap_width).map(&:reverse)
+            end.reverse
+        end
+    end
+
 end
+
+=begin
+--
+hsv2bgr = lambda do |(h,s,v)|
+    a = (v - vmin = (100-s)*v/100)*(h % 60)/60.0
+    vinc, vdec = vmin + a, v - a
+    case h/60
+    when 0 ; [vmin, vinc, v]
+    when 1 ; [vmin, v, vdec]
+    when 2 ; [vinc, v, vmin]
+    when 3 ; [v, vdec, vmin]
+    when 4 ; [v, vmin, vinc]
+    when 5 ; [vdec, vmin, v]
+    end.map{ |i| (2.55 * i).floor }
+end
+=end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: simple_bmp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies: []
-description: As simple as you really need. You get only 40 bytes type header, and
-  currently only either RGB or Grayscale. If it seems to work under <=1.8.7, let me
-  know -- I'll update gemspec.
+description: As simple as you really need. Only BITMAPCOREHEADER (12 bytes) header
+  is used yet, and only 8bpp with no indexing. If it seems to work under <=1.8.7,
+  let me know -- I'll update gemspec.
 email: nakilon@gmail.com
 executables: []
 extensions: []