rixmap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d87da8ef09dd6ee5469552b8baa9a576cb4da1
-  data.tar.gz: 24e2a21db530cdddf6a65e99feb1656e5b745eb0
+  metadata.gz: 68d917985e256067776c2d3b2f43bfda3444e235
+  data.tar.gz: ea89aa3ffc196d656afaebdb5dd499b4964c2db5
 SHA512:
-  metadata.gz: 2f70fb1617536f2dbb4b010e46608b0c8189ac4277a212002d6a5fd8f2255534784262dc3d5427775f3f369a5e3b734af774abe62fe49df75f49d4fccd9333fa
-  data.tar.gz: b893adf73dd5fd5e550da4f6526e56322c75935acadeace954b80c04848272c3086f81999896a0222893120ffe31564f6826312648b91dd09ca227b8de071d69
+  metadata.gz: 66ec63d02d19613561de02e14d9b3a9e669c0011008a58550344deb93e48daa5db8b8cea1c6b78554968a774233ab9302a0ff8636ac85e263826d19ef3a03524
+  data.tar.gz: 3da6eedc56945bdd2ffe1a343498f87c828171f34d9619366b99c063860ca0aa98aa9ae66f8758aa1614eeee4cbbcd60eb3b6a7d2a1887ed5916dc43e501218c

data/Rakefile

@@ -109,7 +109,7 @@ if defined?(YARD::Rake::YardocTask)
     yd.options << '--charset=utf-8'
     yd.options << '--output-dir=doc'
     yd.options << '--no-cache'
-    #yd.options << '--debug'
+    yd.options << '--debug'
     #yd.options << '--single-db'
     #yd.options << '--one-file'
   end
@@ -152,5 +152,5 @@ end
 
 
 #==============================================================================#
-# $Id: Rakefile,v 431aac54543a 2014/04/20 15:12:27 chikuchikugonzalez $
+# $Id: Rakefile,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/format/pcx.rb

@@ -86,10 +86,17 @@ module Rixmap
           @template = "CCCCssssssa48xCSSssx54"
         end
 
+        # 文字列からPCXヘッダデータを復元します.
+        #
+        # @param [String] data ヘッダ文字列
+        # @return [void]
         def unpack(data)
           @magic, @version, @encoding, @bit_width, @left, @top, @right, @bottom, @dpi_x, @dpi_y, @palette, @bit_planes, @line_width, @colortype, @screen_x, @screen_y = data.unpack(@template)
         end
 
+        # 設定されてる属性値をPCXヘッダバイナリ文字列にエンコードします.
+        #
+        # @return [String] PCXヘッダバイナリ文字列
         def pack()
           return [@magic, @version, @encoding, @bit_width, @left, @top, @right, @bottom, @dpi_x, @dpi_y, @palette, @bit_planes, @line_width, @colortype, @screen_x, @screen_y].pack(@template)
         end
@@ -434,5 +441,5 @@ end
 
 
 #==============================================================================#
-# $Id: pcx.rb,v 57b1fb2cd6a6 2014/04/20 12:21:27 chikuchikugonzalez $
+# $Id: pcx.rb,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/format/png.rb

@@ -8,62 +8,62 @@ module Rixmap
     module PNG
 
       # PNGシグネチャ
-      FILE_SIGNATURE      = "\x89PNG\r\n\x1A\n".force_encoding(Encoding::BINARY)
+      FILE_SIGNATURE = "\x89PNG\r\n\x1A\n".force_encoding(Encoding::BINARY).freeze
 
       # PNGシグネチャサイズ
-      FILE_SIGNATURE_SIZE = 8
+      FILE_SIGNATURE_SIZE = 8.freeze
 
       # グレースケール形式
       #
       # ビット幅は 1, 2, 4, 8, 16
-      COLORTYPE_GRAYSCALE = 0x00
+      COLORTYPE_GRAYSCALE = 0x00.freeze
 
       # RGBトゥルーカラー形式
       #
       # ビット幅は 8, 16
-      COLORTYPE_TRUECOLOR = 0x02
+      COLORTYPE_TRUECOLOR = 0x02.freeze
 
       # インデックスカラー形式
       #
       # ビット幅は 1, 2, 4, 8
-      COLORTYPE_INDEXED = 0x03
+      COLORTYPE_INDEXED = 0x03.freeze
 
       # グレースケール形式 with 透明度
       #
       # ビット幅は 8, 16
-      COLORTYPE_GRAYSCALE_WITH_ALPHA = 0x04
+      COLORTYPE_GRAYSCALE_WITH_ALPHA = 0x04.freeze
 
       # RGBトゥルーカラー形式 with 透明度
       #
       # ビット幅は 8, 16
-      COLORTYPE_TRUECOLOR_WITH_ALPHA = 0x06
+      COLORTYPE_TRUECOLOR_WITH_ALPHA = 0x06.freeze
 
       # Deflate圧縮メソッド
-      COMPRESSION_DEFLATE = 0x00
+      COMPRESSION_DEFLATE = 0x00.freeze
 
       # 基本のフィルタタイプ
-      FILTER_ADAPTIVE = 0x00
+      FILTER_ADAPTIVE = 0x00.freeze
 
       # インターレースなし
-      INTERLACE_NONE = 0x00
+      INTERLACE_NONE = 0x00.freeze
 
       # Adam7インターレース
-      INTERLACE_ADAM7 = 0x01
+      INTERLACE_ADAM7 = 0x01.freeze
 
       # なにもしない基本フィルタ
-      ADAPTIVEFILTER_NONE = 0x00
+      ADAPTIVEFILTER_NONE = 0x00.freeze
 
       # 左側差分基本フィルタ
-      ADAPTIVEFILTER_SUB = 0x01
+      ADAPTIVEFILTER_SUB = 0x01.freeze
 
       # 上側差分基本フィルタ
-      ADAPTIVEFILTER_UP = 0x02
+      ADAPTIVEFILTER_UP = 0x02.freeze
 
       # 平均基本フィルタ
-      ADAPTIVEFILTER_AVERAGE = 0x03
+      ADAPTIVEFILTER_AVERAGE = 0x03.freeze
 
       # 周辺から近い色をとって、その差分をとるようなの
-      ADAPTIVEFILTER_PEATH = 0x04
+      ADAPTIVEFILTER_PEATH = 0x04.freeze
     end
 
   end
@@ -74,5 +74,5 @@ require_relative 'png/imageio'
 
 
 #==============================================================================#
-# $Id: png.rb,v 57b1fb2cd6a6 2014/04/20 12:21:27 chikuchikugonzalez $
+# $Id: png.rb,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/format/png/imageio.rb

@@ -10,13 +10,15 @@ module Rixmap
       # スキャンライン用フィルタ実装.
       #
       # @see http://www.milk-island.net/document/png/#9Filters
+      # FIXME これ超重い気がする
       class AdaptiveFilter
         # デフォルトフィルタ実装を初期化します.
         #
         # @param [Rixmap::Mode] mode 画像形式
         def initialize(mode)
-          @prev = nil
+          @prev = Rixmap::Binary.new()
           @mode = mode
+          @size = mode.channels.size
         end
 
         # フィルタ関数
@@ -26,15 +28,52 @@ module Rixmap
         # @return [Array] フィルタ処理後スキャンライン
         def filt(line, method = ADAPTIVEFILTER_NONE)
           base_line = Rixmap::Binary.new(line)
-          filt_line = Rixmap::Binary.new([method])
+          filt_line = Rixmap::Binary.new()
           case method
           when ADAPTIVEFILTER_NONE
             filt_line += base_line
+          when ADAPTIVEFILTER_SUB
+            base_line.each_with_index do |byte, i|
+              prev_idx  = i - @size
+              prev_byte = if prev_idx < 0
+                            0
+                          else
+                            base_line[prev_idx]
+                          end
+              filt_line[i] = byte - prev_byte
+            end
+          when ADAPTIVEFILTER_UP
+            base_line.each_with_index do |byte, i|
+              filt_line[i] = byte - @prev[i].to_i
+            end
+          when ADAPTIVEFILTER_AVERAGE
+            base_line.each_with_index do |byte, i|
+              before_idx  = i - @size
+              before_byte = if before_idx < 0
+                              0
+                            else
+                              base_line[before_idx]
+                            end
+              prev_byte = @prev[i].to_i
+              filt_line[i] = byte - ((before_byte + prev_byte) / 2.0).floor
+            end
+          when ADAPTIVEFILTER_PEATH
+            base_line.each_with_index do |byte, i|
+              before_idx  = i - @size
+              byte_a, byte_c = if before_idx < 0
+                                 [0, 0]
+                               else
+                                 [base_line[before_idx], @prev[before_idx].to_i]
+                               end
+              byte_b = @prev[i].to_i
+              filt_line[i] = byte - self.peath_predicator(byte_a, byte_b, byte_c)
+            end
           else
             raise NotImplementedError.new("Unsupported Filter Method: #{method}")
           end
 
           @prev = base_line
+          filt_line.unshift(method)
           return filt_line
         end
 
@@ -49,13 +88,68 @@ module Rixmap
           case method
           when ADAPTIVEFILTER_NONE
             recon_line += base_line
+          when ADAPTIVEFILTER_SUB
+            base_line.each_with_index do |byte, i|
+              prev_idx  = i - @size
+              prev_byte = if prev_idx < 0
+                            0
+                          else
+                            recon_line[prev_idx]
+                          end
+              recon_line[i] = byte + prev_byte
+            end
+          when ADAPTIVEFILTER_UP
+            base_line.each_with_index do |byte, i|
+              recon_line[i] = byte + @prev[i].to_i
+            end
+          when ADAPTIVEFILTER_AVERAGE
+            base_line.each_with_index do |byte, i|
+              before_idx  = i - @size
+              before_byte = if before_idx < 0
+                              0
+                            else
+                              recon_line[before_idx]
+                            end
+              prev_byte = @prev[i].to_i
+              recon_line[i] = byte + ((before_byte + prev_byte) / 2.0).floor
+            end
+          when ADAPTIVEFILTER_PEATH
+            base_line.each_with_index do |byte, i|
+              before_idx  = i - @size
+              byte_a, byte_c = if before_idx < 0
+                                 [0, 0]
+                               else
+                                 [recon_line[before_idx], @prev[before_idx].to_i]
+                               end
+              byte_b = @prev[i].to_i
+              recon_line[i] = byte + self.peath_predicator(byte_a, byte_b, byte_c)
+            end
           else
             raise NotImplementedError.new("Unsupported Filter Method: #{method}")
           end
 
-          @prev = base_line
+          @prev = recon_line
           return recon_line
         end
+
+        # Peathフィルタ用判定関数
+        #
+        # @see http://www.milk-island.net/document/png/#9Filter-type-4-Paeth
+        def peath_predicator(a, b, c)
+          p  = a + b - c
+          pa = (p - a).abs
+          pb = (p - b).abs
+          pc = (p - c).abs
+          pr = if pa <= pb && pa <= pc
+                 a
+               elsif pb <= pc
+                 b
+               else
+                 c
+               end
+          return pr
+        end
+        protected :peath_predicator
       end
 
       # PNG入出力実装クラス.
@@ -78,10 +172,42 @@ module Rixmap
           return true
         end
 
+        # ピクセルデータ圧縮時の圧縮レベル.
+        #
+        # 値としては {Zlib} モジュールの定数か、0～9の数値を指定します.
+        #
+        # @return [Integer] 圧縮レベル
+        attr_accessor :compression_level
+
+        # スキャンライン毎のフィルタリングメソッド.
+        #
+        # 値は以下のいずれかです.
+        #
+        # - {PNG::ADAPTIVEFILTER_NONE}
+        # - {PNG::ADAPTIVEFILTER_SUB}
+        # - {PNG::ADAPTIVEFILTER_UP}
+        # - {PNG::ADAPTIVEFILTER_AVERAGE}
+        # - {PNG::ADAPTIVEFILTER_PEATH}
+        #
+        # @return [Integer] フィルタリングメソッド
+        attr_accessor :filter_method
+
+        # PNG入出力オブジェクトを初期化します.
+        #
+        # @param [Hash] options オプションパラメータ
+        # @option options [Integer] :compression_level 圧縮レベル (0-9).
+        # @option options [Integer] :filter_method スキャンラインのフィルタリングメソッド
+        def initialize(options={})
+          @compression_level = Zlib::BEST_COMPRESSION
+          @filter_method     = ADAPTIVEFILTER_UP
+          super(options)
+        end
+
         # 画像をPNG形式でエンコードします.
         #
         # @param [Rixmap::Image] image 対象画像
         # @param [Hash] options オプションパラメータ
+        # @option options [Integer] :filter_method スキャンラインのフィルタリングメソッド
         # @return [String] エンコードされた画像データ
         def encode(image, options={})
           # イメージヘッダ
@@ -96,6 +222,17 @@ module Rixmap
           # ピクセルデータ
           pixels = ''.force_encoding(Encoding::BINARY)
           filter = AdaptiveFilter.new(image.mode)
+          filter_method = nil
+          case options[:filter_method]
+          when ADAPTIVEFILTER_NONE, ADAPTIVEFILTER_SUB, ADAPTIVEFILTER_UP, ADAPTIVEFILTER_AVERAGE, ADAPTIVEFILTER_PEATH
+            filter_method = options[:filter_method].to_i
+          else
+            filter_method = @filter_method
+          end
+          compression_level = @compression_level
+          unless options[:compression_level].nil?
+            compression_level = options[:compression_level].to_i
+          end
 
           # 画像種別による処理
           case image.mode
@@ -111,34 +248,34 @@ module Rixmap
             # ピクセルを作成
             image.each_line do |line|
               # ByteArrayはto_bytesできる
-              pixels.concat(filter.filt(line).to_str)
+              pixels.concat(filter.filt(line, filter_method).to_str)
             end
           when Rixmap::GRAYSCALE
             ihdr.colortype = COLORTYPE_GRAYSCALE
             image.each_line do |line|
-              pixels.concat(filter.filt(line).to_str)
+              pixels.concat(filter.filt(line, filter_method).to_str)
             end
           when Rixmap::GRAYALPHA
             ihdr.colortype = COLORTYPE_GRAYSCALE_WITH_ALPHA
             image.each_line do |line|
-              pixels.concat(filter.filt(line.to_s('LA')).to_str)
+              pixels.concat(filter.filt(line.to_s('LA'), filter_method).to_str)
             end
           when Rixmap::RGB
             ihdr.colortype = COLORTYPE_TRUECOLOR
             image.each_line do |line|
-              pixels.concat(filter.filt(line.to_s('RGB')).to_str)
+              pixels.concat(filter.filt(line.to_s('RGB'), filter_method).to_str)
             end
           when Rixmap::RGBA
             ihdr.colortype = COLORTYPE_TRUECOLOR_WITH_ALPHA
             image.each_line do |line|
-              pixels.concat(filter.filt(line.to_s('RGBA')).to_str)
+              pixels.concat(filter.filt(line.to_s('RGBA'), filter_method).to_str)
             end
           else
             raise ArgumentError.new("Unknown image mode: #{image.mode}")
           end
 
           # ピクセルを圧縮
-          deflated_pixels = Zlib.deflate(pixels, Zlib::BEST_COMPRESSION)
+          deflated_pixels = Zlib.deflate(pixels, compression_level)
 
           # IDATチャンクを生成
           idat = Chunk::IDATChunk.new
@@ -284,5 +421,5 @@ end
 
 
 #==============================================================================#
-# $Id: imageio.rb,v 57b1fb2cd6a6 2014/04/20 12:21:27 chikuchikugonzalez $
+# $Id: imageio.rb,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/version.rb

@@ -10,7 +10,7 @@ module Rixmap
   VERSION_MINOR = 1
 
   # リビジョン番号のようなもの
-  VERSION_TEENY = 0
+  VERSION_TEENY = 1
 
   # バージョン番号 (数値表現)
   VERSION_NUMBER = (VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | VERSION_TEENY
@@ -22,5 +22,5 @@ end
 
 
 #==============================================================================#
-# $Id: version.rb,v 431aac54543a 2014/04/20 15:12:27 chikuchikugonzalez $
+# $Id: version.rb,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/src/rixmapcore.cxx

@@ -1233,6 +1233,22 @@ static VALUE Mode_getDepth(VALUE self) {
     return INT2FIX(_this->getDepth());
 }
 
+/**
+ * この画像形式に含まれるチャンネルリストを返します.
+ *
+ * @return [Array<String>] チャンネルリスト
+ */
+static VALUE Mode_getChannels(VALUE self) {
+    Rixmap::ModeData* _this = rixmap_unwrap<Rixmap::ModeData>(self);
+    const Rixmap::ChannelArray& channels = _this->getChannels();
+    VALUE items = rb_ary_new();
+    for (auto it = channels.begin(); it != channels.end(); it++) {
+        const char ch = static_cast<char>(*it);
+        rb_ary_push(items, rb_str_new(&ch, 1));
+    }
+    return items;
+}
+
 /**
  * RGBカラー形式かどうかを返します.
  *
@@ -3040,6 +3056,7 @@ void RixmapCore_Init() {
     rb_define_alloc_func(cRixmapMode, Mode_Alloc);
     rb_define_method(cRixmapMode, "name",       RUBY_METHOD_FUNC(Mode_getName), 0);
     rb_define_method(cRixmapMode, "depth",      RUBY_METHOD_FUNC(Mode_getDepth), 0);
+    rb_define_method(cRixmapMode, "channels",   RUBY_METHOD_FUNC(Mode_getChannels), 0);
     rb_define_method(cRixmapMode, "rgb?",       RUBY_METHOD_FUNC(Mode_isRGBType), 0);
     rb_define_method(cRixmapMode, "grayscale?", RUBY_METHOD_FUNC(Mode_isGrayScaleType), 0);
     rb_define_method(cRixmapMode, "indexed?",   RUBY_METHOD_FUNC(Mode_isIndexedType), 0);
@@ -3205,5 +3222,5 @@ void RixmapCore_Init() {
 
 
 //============================================================================//
-// $Id: rixmapcore.cxx,v 5b9a0968eca5 2014/04/20 13:37:36 chikuchikugonzalez $
+// $Id: rixmapcore.cxx,v f933bbbed93e 2014/04/21 14:36:01 chikuchikugonzalez $
 // vim: set sts=4 ts=4 sw=4 expandtab foldmethod=marker:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rixmap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - chikuchikugonzalez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +64,12 @@ email: chikuchikugonzalez@gmail.com
 executables: []
 extensions:
 - src/extconf.rb
-extra_rdoc_files: []
+extra_rdoc_files:
+- src/rixmapcore.cxx
+- src/rixmapio.cxx
+- src/rixmapmain.cxx
+- README.markdown
+- LICENSE.txt
 files:
 - src/rixmapcore.cxx
 - src/rixmapio.cxx