rixmap 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e26b472bc191ddd69675d65ee6f895f996154a
-  data.tar.gz: 2c4fcc4f88a872a2ca9931a1c1bc76318fabcbb7
+  metadata.gz: 9f6435a7962daf5424c697df94925bc26b079704
+  data.tar.gz: abcd536696bc451ca7577ef7b2b3b235d041e329
 SHA512:
-  metadata.gz: 8102c25bd276e0c609955339d9021f3f2225ed763b2960b393b193f3e98e2370c21816884f784229b4b52a554ef4f1f2880780f3d21f50e19ea0b1153e5d5506
-  data.tar.gz: d23775f951cf185d353bf86ad918cb18c2fdce7f49e5f6adfeb54e29abdadd14b5b30dbe58c2887728aad2f79d92c5a3f3ec1be3779cbf0c6fcd44630843dd38
+  metadata.gz: fc3fd8f1a09baa47230ebfcf3eba97b674c051f0c4a1333243e45b0c3ab5bebf592920701d02dcf3509d34e7050e51d19a587da99b97ac374905724b39300c5d
+  data.tar.gz: ac6c1e5b85fd0865b73fff73d35afe9c91d6d927349113a91a0ebecbe1c3655c2a93fc1edf812f66f957c72d2a07958f59ddbed26696f36f3f8259bc9fb386ae

data/Rakefile

@@ -109,7 +109,9 @@ if defined?(YARD::Rake::YardocTask)
     yd.options << '--charset=utf-8'
     yd.options << '--output-dir=doc'
     yd.options << '--no-cache'
+    yd.options << '--hide-void-return'
     yd.options << '--debug'
+    yd.options << '--no-yardopts'
     #yd.options << '--single-db'
     #yd.options << '--one-file'
   end
@@ -152,5 +154,5 @@ end
 
 
 #==============================================================================#
-# $Id: Rakefile,v 753dbf70cab3 2014/05/16 16:13:38 chikuchikugonzalez $
+# $Id: Rakefile,v e37e8dfe0f98 2014/05/22 14:14:05 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/format/bmp.rb

@@ -270,6 +270,9 @@ module Rixmap
 
             # パレットを復元
             ncolors = bi.used_color_count
+            if ncolors <= 0
+              ncolors = 2 ** bi.bit_count
+            end
             palbytes = data.byteslice((FILEHEADER_SIZE + bi.size), (ncolors * 4))
             palbytes.unpack('C*').each_slice(4).each_with_index do |c, i|
               break if i >= image.palette.size
@@ -322,5 +325,5 @@ end
 
 
 #==============================================================================#
-# $Id: bmp.rb,v 57b1fb2cd6a6 2014/04/20 12:21:27 chikuchikugonzalez $
+# $Id: bmp.rb,v b9cbf891f8da 2014/05/24 16:23:15 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

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

@@ -112,12 +112,10 @@ module Rixmap
           # #data から呼び出されます
           def pack()
           end
-          protected :pack
 
           # データ更新後の、内部プロパティ更新処理を行います.
           def unpack()
           end
-          protected :unpack
 
         end
 
@@ -156,12 +154,10 @@ module Rixmap
           def pack()
             @data = [@width, @height, @depth, @colortype, @compress, @filter, @interlace].pack(IHDRChunk::LAYOUT)
           end
-          protected :pack
 
           def unpack()
             @width, @height, @depth, @colortype, @compress, @filter, @interlace = @data.unpack(IHDRChunk::LAYOUT)
           end
-          protected :unpack
 
           # チャンクリストへ登録
           Chunk.set(self::TYPE, self)
@@ -201,12 +197,10 @@ module Rixmap
           def pack()
             @data = @colors.pack(PLTEChunk::LAYOUT)
           end
-          protected :pack
 
           def unpack()
             @colors = @data.unpack(PLTEChunk::LAYOUT)
           end
-          protected :unpack
 
           # チャンクリストへ登録
           Chunk.set(self::TYPE, self)
@@ -238,6 +232,183 @@ module Rixmap
           Chunk.set(self::TYPE, self)
         end
 
+        # tRNS補助チャンク. 透明度または透過色を扱います.
+        class TRNSAncillaryChunk < BaseChunk
+          # tRNSチャンクタイプ
+          TYPE = 'tRNS'
+
+          # グレースケール用packレイアウト
+          LAYOUT_GRAYSCALE = 'n'
+
+          # RGBカラー用packレイアウト
+          LAYOUT_RGB       = 'nnn'
+
+          # インデックスカラー用packレイアウト
+          LAYOUT_INDEXED   = 'C*'
+
+          attr_accessor :colortype
+          attr_accessor :gray
+          attr_accessor :red
+          attr_accessor :green
+          attr_accessor :blue
+          attr_accessor :indexes
+
+          def initialize(colortype = nil)
+            @colortype = colortype
+            @gray    = nil
+            @red     = nil
+            @green   = nil
+            @blue    = nil
+            @indexes = nil
+            super(TRNSAncillaryChunk::TYPE)
+          end
+
+          def value()
+            case @colortype
+            when COLORTYPE_INDEXED
+              return @indexes
+            when COLORTYPE_GRAYSCALE
+              return @gray
+            when COLORTYPE_TRUECOLOR
+              return [@red, @green, @blue]
+            else
+              return nil
+            end
+          end
+
+          def value=(val)
+            case @colortype
+            when COLORTYPE_INDEXED
+              @indexes = Array(val)
+            when COLORTYPE_GRAYSCALE
+              @gray = val.to_i
+            when COLORTYPE_TRUECOLOR
+              @red   = val[0]
+              @green = val[1]
+              @blue  = val[2]
+            end
+          end
+
+          def pack()
+            case @colortype
+            when COLORTYPE_INDEXED
+              @data = @indexes.pack(TRNSAncillaryChunk::LAYOUT_INDEXED)
+            when COLORTYPE_GRAYSCALE
+              @data = [@gray].pack(TRNSAncillaryChunk::LAYOUT_GRAYSCALE)
+            when COLORTYPE_TRUECOLOR
+              @data = [@red, @green, @blue].pack(TRNSAncillaryChunk::LAYOUT_RGB)
+            else
+              @data = ''
+            end
+          end
+
+          def unpack()
+            case @colortype
+            when COLORTYPE_INDEXED
+              @indexes = @data.unpack(TRNSAncillaryChunk::LAYOUT_INDEXED)
+            when COLORTYPE_GRAYSCALE
+              @gray = @data.unpack(TRNSAncillaryChunk::LAYOUT_GRAYSCALE)[0]
+            when COLORTYPE_TRUECOLOR
+              @red, @green, @blue = @data.unpack(TRNSAncillaryChunk::LAYOUT_RGB)
+            end
+          end
+
+          # チャンクリストへ登録
+          Chunk.set(self::TYPE, self)
+        end
+
+        # bKGD補助チャンク. 背景色を保存しています.
+        class BKGDAncillaryChunk < BaseChunk
+          # bKGDチャンクタイプ
+          TYPE = 'bKGD'
+
+          # インデックスカラー用packレイアウト
+          LAYOUT_INDEXED = 'C'
+
+          # グレースケール用packレイアウト
+          LAYOUT_GRAYSCALE = 'n'
+
+          # RGBカラー用packレイアウト
+          LAYOUT_RGB = 'nnn'
+
+          attr_accessor :colortype
+          attr_accessor :luminance
+          attr_accessor :red
+          attr_accessor :green
+          attr_accessor :blue
+          attr_accessor :palette
+
+          def initialize(colortype = nil)
+            # 画像形式
+            @colortype = colortype
+
+            # グレースケール用
+            @luminance = nil
+
+            # RGBカラー用
+            @red   = nil
+            @green = nil
+            @blue  = nil
+
+            # パレット形式用
+            @palette = nil
+            super(BKGDAncillaryChunk::TYPE)
+          end
+
+          def value()
+            case @colortype
+            when COLORTYPE_INDEXED
+              return @palette
+            when COLORTYPE_GRAYSCALE, COLORTYPE_GRAYSCALE_WITH_ALPHA
+              return @luminance
+            when COLORTYPE_TRUECOLOR, COLORTYPE_TRUECOLOR_WITH_ALPHA
+              return [@red, @green, @blue]
+            else
+              return nil
+            end
+          end
+
+          def value=(val)
+            case @colortype
+            when COLORTYPE_INDEXED
+              @palette = val.to_i
+            when COLORTYPE_GRAYSCALE, COLORTYPE_GRAYSCALE_WITH_ALPHA
+              @luminance = val.to_i
+            when COLORTYPE_TRUECOLOR, COLORTYPE_TRUECOLOR_WITH_ALPHA
+              @red   = val[0] # color.red
+              @green = val[1] # color.green
+              @blue  = val[2] # color.blue
+            end
+          end
+
+          def pack()
+            case @colortype
+            when COLORTYPE_INDEXED
+              @data = [@palette.to_i].pack(BKGDAncillaryChunk::LAYOUT_INDEXED)
+            when COLORTYPE_GRAYSCALE, COLORTYPE_GRAYSCALE_WITH_ALPHA
+              @data = [@luminance.to_i].pack(BKGDAncillaryChunk::LAYOUT_GRAYSCALE)
+            when COLORTYPE_TRUECOLOR, COLORTYPE_TRUECOLOR_WITH_ALPHA
+              @data = [@red.to_i, @green.to_i, @blue.to_i].pack(BKGDAncillaryChunk::LAYOUT_RGB)
+            else
+              @data = ''
+            end
+          end
+
+          def unpack()
+            case @colortype
+            when COLORTYPE_INDEXED
+              @palette = @data.unpack(BKGDAncillaryChunk::LAYOUT_INDEXED)[0]
+            when COLORTYPE_GRAYSCALE, COLORTYPE_GRAYSCALE_WITH_ALPHA
+              @luminance = @data.unpack(BKGDAncillaryChunk::LAYOUT_GRAYSCALE)[0]
+            when COLORTYPE_TRUECOLOR, COLORTYPE_TRUECOLOR_WITH_ALPHA
+              @red, @green, @blue = @data.unpack(BKGDAncillaryChunk::LAYOUT_RGB)
+            end
+          end
+
+          # チャンクリストへ登録
+          Chunk.set(self::TYPE, self)
+        end
+
       end
 
     end
@@ -246,5 +417,5 @@ end
 
 
 #==============================================================================#
-# $Id: chunk.rb,v 753dbf70cab3 2014/05/16 16:13:38 chikuchikugonzalez $
+# $Id: chunk.rb,v a60a21c75463 2014/05/30 17:04:13 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

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

@@ -235,14 +235,35 @@ module Rixmap
           end
 
           # 画像種別による処理
+          trns = nil  # 透明度チャンクデータ
           case image.mode
           when Rixmap::INDEXED
             ihdr.colortype = COLORTYPE_INDEXED
 
             # パレットを設定
             plte = Chunk::PLTEChunk.new
+            alphas = []
+            hasalpha = false
             image.palette.each_with_index do |color, i|
               plte[i] = [color.red, color.green, color.blue]
+              alphas << color.alpha
+              if color.alpha < 255
+                hasalpha = true
+              end
+            end
+
+            if hasalpha
+              # 基本的にパレットのαを入れる
+              trns = Chunk::TRNSAncillaryChunk.new(ihdr.colortype)
+              trns.indexes = alphas
+            elsif !image.transparent.nil?
+              # 透過インデックス設定の場合
+              # ※ 復元できない
+              trns = Chunk::TRNSAncillaryChunk.new(ihdr.colortype)
+              index = image.transparent.to_i
+              indexes = [255] * index
+              indexes[index] = 0
+              trns.indexes = indexes
             end
 
             # ピクセルを作成
@@ -255,6 +276,11 @@ module Rixmap
             image.each_line do |line|
               pixels.concat(filter.filt(line, filter_method).to_str)
             end
+
+            unless image.transparent.nil?
+              trns = Chunk::TRNSAncillaryChunk.new(ihdr.colortype)
+              trns.gray = image.transparent.to_i
+            end
           when Rixmap::GRAYALPHA
             ihdr.colortype = COLORTYPE_GRAYSCALE_WITH_ALPHA
             image.each_line do |line|
@@ -265,6 +291,11 @@ module Rixmap
             image.each_line do |line|
               pixels.concat(filter.filt(line.to_s('RGB'), filter_method).to_str)
             end
+
+            unless image.transparent.nil?
+              trns = Chunk::TRNSAncillaryChunk.new(ihdr.colortype)
+              trns.value = image.transparent
+            end
           when Rixmap::RGBA
             ihdr.colortype = COLORTYPE_TRUECOLOR_WITH_ALPHA
             image.each_line do |line|
@@ -281,11 +312,21 @@ module Rixmap
           idat = Chunk::IDATChunk.new
           idat.data = deflated_pixels
 
-          # チャンクリスト
+          # チャンクリストの作成開始
           chunks = []
           chunks << ihdr
           chunks << plte unless plte.nil?
           chunks << idat
+          chunks << trns unless trns.nil?
+
+          # 背景色
+          unless image.background.nil?
+            bkgd = Chunk::BKGDAncillaryChunk.new(ihdr.colortype)
+            bkgd.value = image.background
+            chunks << bkgd
+          end
+
+          # チャンクリスト構築終了
           chunks << Chunk::IENDChunk.new
 
           # PNGストリームを構築
@@ -340,6 +381,8 @@ module Rixmap
               warn("Unknown or Not-Implemented Chunk Type: #{chunk_type}")
               next
             end
+
+            # チャンクを作成
             chunk = Chunk.get(chunk_type).new
             chunk.data = chunk_data
 
@@ -361,18 +404,33 @@ module Rixmap
           # 残りチャンクを処理
           image_data = ''
           palette    = nil
+          bgcolor    = nil
+          transcolor = nil
           chunks.each do |chunk|
             case chunk
             when Chunk::IDATChunk
               image_data.concat(chunk.data)
+
             when Chunk::PLTEChunk
               palette = Rixmap::Palette.new(2 ** image_depth)
               palette.size.times do |i|
                 palette[i] = chunk[i]
               end
+
             when Chunk::IENDChunk
               break
+
+            when Chunk::BKGDAncillaryChunk
+              chunk.colortype = colortype
+              chunk.unpack    # 中身を更新
+              bgcolor = chunk.value
+
+            when Chunk::TRNSAncillaryChunk
+              chunk.colortype = colortype
+              chunk.unpack
+              transcolor = chunk.value
             end
+
           end
 
           # ピクセルを復元
@@ -382,31 +440,41 @@ module Rixmap
           image = nil
           case colortype
           when COLORTYPE_INDEXED
-            image  = Rixmap::Image.new(Rixmap::INDEXED, image_width, image_height, :palette => palette)
+            image  = Rixmap::Image.new(Rixmap::INDEXED, image_width, image_height, :palette => palette, :background => bgcolor)
             filter = AdaptiveFilter.new(image.mode)
             pixels.each_slice(image_width + 1).each_with_index do |bytes, i|
               image[i] = filter.recon(bytes)
             end
+
+            # 透明度を反映
+            unless transcolor.nil?
+              transcolor.each_with_index do |alpha, i|
+                color = image.palette[i].to_a
+                color[3] = alpha
+                image.palette[i] = color
+                # TODO image.palette[i]の結果をPaletteColorとかにして、各コンポーネント毎に編集できるようにするべきかな
+              end
+            end
           when COLORTYPE_GRAYSCALE
-            image  = Rixmap::Image.new(Rixmap::GRAYSCALE, image_width, image_height)
+            image  = Rixmap::Image.new(Rixmap::GRAYSCALE, image_width, image_height, :background => bgcolor, :transparent => transcolor)
             filter = AdaptiveFilter.new(image.mode)
             pixels.each_slice(image_width + 1).each_with_index do |bytes, i|
               image[i] = filter.recon(bytes)
             end
           when COLORTYPE_GRAYSCALE_WITH_ALPHA
-            image  = Rixmap::Image.new(Rixmap::GRAYALPHA, image_width, image_height)
+            image  = Rixmap::Image.new(Rixmap::GRAYALPHA, image_width, image_height, :background => bgcolor)
             filter = AdaptiveFilter.new(image.mode)
             pixels.each_slice((image_width * 2) + 1).each_with_index do |bytes, i|
               image[i] = filter.recon(bytes)
             end
           when COLORTYPE_TRUECOLOR
-            image  = Rixmap::Image.new(Rixmap::RGB, image_width, image_height)
+            image  = Rixmap::Image.new(Rixmap::RGB, image_width, image_height, :background => bgcolor, :transparent => transcolor)
             filter = AdaptiveFilter.new(image.mode)
             pixels.each_slice((image_width * 3) + 1).each_with_index do |bytes, i|
               image[i] = filter.recon(bytes)
             end
           when COLORTYPE_TRUECOLOR_WITH_ALPHA
-            image  = Rixmap::Image.new(Rixmap::RGBA, image_width, image_height)
+            image  = Rixmap::Image.new(Rixmap::RGBA, image_width, image_height, :background => bgcolor)
             filter = AdaptiveFilter.new(image.mode)
             pixels.each_slice((image_width * 4) + 1).each_with_index do |bytes, i|
               image[i] = filter.recon(bytes)
@@ -427,5 +495,5 @@ end
 
 
 #==============================================================================#
-# $Id: imageio.rb,v 753dbf70cab3 2014/05/16 16:13:38 chikuchikugonzalez $
+# $Id: imageio.rb,v a60a21c75463 2014/05/30 17:04:13 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/lib/rixmap/version.rb

@@ -7,10 +7,10 @@ module Rixmap
   VERSION_MAJOR = 0
 
   # マイナーバージョン番号
-  VERSION_MINOR = 2
+  VERSION_MINOR = 3
 
   # バグ修正回数
-  VERSION_PATCH = 1
+  VERSION_PATCH = 0
 
   # バージョン番号 (数値表現)
   VERSION_NUMBER = (VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | VERSION_PATCH
@@ -22,5 +22,5 @@ end
 
 
 #==============================================================================#
-# $Id: version.rb,v dd7cf49aa98a 2014/05/17 06:49:55 chikuchikugonzalez $
+# $Id: version.rb,v 3d37b3ca070b 2014/05/17 06:54:52 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/spec/palette_spec.rb

@@ -69,9 +69,27 @@ describe Rixmap::Palette do
       end
     end
   end
+
+  context "Palette export/import check" do
+    before do
+      @palette = Rixmap::Palette.new(4)
+      @palette[0] = Rixmap::Color.new(255, 0, 0)
+      @palette[1] = Rixmap::Color.new(0, 255, 0)
+      @palette[2] = Rixmap::Color.new(0, 0, 255)
+      @palette[3] = Rixmap::Color.new(0, 0, 0)
+      @data    = "\xFF\x00\x00\xFF\x00\xFF\x00\xFF\x00\x00\xFF\xFF\x00\x00\x00\xFF".force_encoding(Encoding::BINARY)
+    end
+
+    it "export data match to data" do expect(@palette.export('RGBA')).to eq(@data) end
+    it "import binary data" do
+      palette = Rixmap::Palette.new(4)
+      palette.import!(@data, 'RGBA')
+      expect(@palette).to eq(palette)
+    end
+  end
 end
 
 
 #==============================================================================#
-# $Id: palette_spec.rb,v 36d5b09e38de 2014/03/30 11:13:09 chikuchikugonzalez $
+# $Id: palette_spec.rb,v 6f1b9e3e62b2 2014/05/18 08:46:26 chikuchikugonzalez $
 # vim: set sts=2 ts=2 sw=2 expandtab:

data/src/rixmap/channel.hxx

@@ -29,6 +29,111 @@ namespace Rixmap {
         ALPHA     = 'A',        // 透明度
     };
 
+    /**
+     * 各チャンネルデータを一括で扱うための構造体.
+     */
+    class ChannelByteSet {
+    protected:      // 非公開メンバ
+        std::map<Channel, uint8_t> _data;
+
+    public:         // コンストラクタ
+        /**
+         * デフォルトコンストラクタ.
+         * 全チャンネルを0で初期化します.
+         */
+        ChannelByteSet() {
+            this->clear();
+        }
+
+        /**
+         * グレースケール値からチャンネルデータを初期化します.
+         *
+         * @param [uint8_t] luminance 輝度値
+         * @param [uint8_t] alpha     透明度
+         */
+        ChannelByteSet(uint8_t luminance, uint8_t alpha = 255) {
+            this->clear();
+            this->setLuminance(luminance);
+            this->setAlpha(alpha);
+        }
+
+        /**
+         * RGB値からチャンネルデータを初期化します.
+         *
+         * @param [uint8_t] red   赤要素値
+         * @param [uint8_t] green 緑要素値
+         * @param [uint8_t] blue  青要素値
+         * @param [uint8_t] alpha 透明度
+         */
+        ChannelByteSet(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha = 255) {
+            this->clear();
+            this->setRed(red);
+            this->setGreen(green);
+            this->setBlue(blue);
+            this->setAlpha(alpha);
+        }
+
+        /**
+         * コピーコンストラクタ
+         */
+        ChannelByteSet(const ChannelByteSet& bytes) {
+            this->clear();
+            this->_data = bytes._data;
+        }
+
+        /**
+         * デストラクタ
+         */
+        virtual ~ChannelByteSet() {}
+
+    public:         // 公開プロパティメンバ関数
+        inline uint8_t getRed()       { return this->_data.at(Channel::RED); }
+        inline uint8_t getGreen()     { return this->_data.at(Channel::GREEN); }
+        inline uint8_t getBlue()      { return this->_data.at(Channel::BLUE); }
+        inline uint8_t getAlpha()     { return this->_data.at(Channel::ALPHA); }
+        inline uint8_t getLuminance() { return this->_data.at(Channel::LUMINANCE); }
+        inline uint8_t getPalette()   { return this->_data.at(Channel::PALETTE); }
+
+        inline void setRed(uint8_t value) { this->_data[Channel::RED] = value; }
+        inline void setGreen(uint8_t value) { this->_data[Channel::GREEN] = value; }
+        inline void setBlue(uint8_t value) { this->_data[Channel::BLUE] = value; }
+        inline void setAlpha(uint8_t value) { this->_data[Channel::ALPHA] = value; }
+        inline void setLuminance(uint8_t value) { this->_data[Channel::LUMINANCE] = value; }
+        inline void setPalette(uint8_t value) { this->_data[Channel::PALETTE] = value; }
+
+    public:         // 公開メンバ関数
+
+    public:         // 公開演算子
+        inline uint8_t operator[](Channel channel) { return this->_data.at(channel); }
+        inline ChannelByteSet& operator=(const ChannelByteSet& bytes) {
+            this->_data = bytes._data;
+            return *this;
+        }
+
+        inline bool operator==(const ChannelByteSet& bytes) {
+            return (   (this->_data.at(Channel::RED)       == bytes._data.at(Channel::RED))
+                    && (this->_data.at(Channel::GREEN)     == bytes._data.at(Channel::GREEN))
+                    && (this->_data.at(Channel::BLUE)      == bytes._data.at(Channel::BLUE))
+                    && (this->_data.at(Channel::ALPHA)     == bytes._data.at(Channel::ALPHA))
+                    && (this->_data.at(Channel::LUMINANCE) == bytes._data.at(Channel::LUMINANCE))
+                    && (this->_data.at(Channel::PALETTE)   == bytes._data.at(Channel::PALETTE))
+                   );
+        }
+        inline bool operator!=(const ChannelByteSet& bytes) { return !(*this == bytes); }
+
+    protected:      // 非公開メンバ関数
+        /**
+         * 各バイトデータを初期化します.
+         */
+        inline void clear() {
+            this->_data[Channel::PALETTE  ] = 0;
+            this->_data[Channel::LUMINANCE] = 0;
+            this->_data[Channel::RED  ]     = 0;
+            this->_data[Channel::GREEN]     = 0;
+            this->_data[Channel::BLUE ]     = 0;
+            this->_data[Channel::ALPHA]     = 255;
+        }
+    };
 }
 
 //----------------------------------------------------------------------------//
@@ -38,5 +143,5 @@ namespace Rixmap {
 
 
 //============================================================================//
-// $Id: channel.hxx,v 8870c1d9926f 2014/03/18 16:09:35 chikuchikugonzalez $
+// $Id: channel.hxx,v 34aa9654fa22 2014/05/21 14:50:19 chikuchikugonzalez $
 // vim: set sts=4 ts=4 sw=4 expandtab foldmethod=marker: