carray 1.5.4 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
 - data/NEWS.md +5 -0
 - data/carray.gemspec +1 -1
 - data/ext/carray_cast.c +1 -1
 - data/ext/carray_test.c +4 -0
 - data/ext/extconf.rb +4 -0
 - data/ext/version.h +4 -4
 - data/lib/carray.rb +1 -1
 - data/lib/carray/serialize.rb +12 -12
 - metadata +2 -2
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            SHA256:
         
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 4c7a72221863bbee2085dc603cd57a4970c34dc5236640e47819f3fa503d2b00
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: e09709eedecd9679ddf8cfa13d047cfa60014728a07d864fa6c29a372f49ea08
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: 7c096ade9e0141172eec06ed71660c6930929231b94b57c3a659e30ffe90c323117a5fb4f5c533517c4460355549586b193e134e4a456876fbab9deea78a4360
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 04e3c2e157f3a5a088d008cccdb1307549cbb0105538f1495e728e61f9c824b5034315d07faae0498795671d055c892ee8f596a5ad8b4700ecc79c0a6fd993a1
         
     | 
    
        data/NEWS.md
    CHANGED
    
    
    
        data/carray.gemspec
    CHANGED
    
    
    
        data/ext/carray_cast.c
    CHANGED
    
    
    
        data/ext/carray_test.c
    CHANGED
    
    | 
         @@ -245,9 +245,11 @@ rb_ca_is_valid_index (int argc, VALUE *argv, VALUE self) 
     | 
|
| 
       245 
245 
     | 
    
         
             
              }
         
     | 
| 
       246 
246 
     | 
    
         
             
              for (i=0; i<ca->ndim; i++) {
         
     | 
| 
       247 
247 
     | 
    
         
             
                idx = NUM2SIZE(argv[i]);
         
     | 
| 
      
 248 
     | 
    
         
            +
            		/*
         
     | 
| 
       248 
249 
     | 
    
         
             
                if ( idx < 0 ) {
         
     | 
| 
       249 
250 
     | 
    
         
             
                  idx += ca->dim[i];
         
     | 
| 
       250 
251 
     | 
    
         
             
                }
         
     | 
| 
      
 252 
     | 
    
         
            +
            		*/
         
     | 
| 
       251 
253 
     | 
    
         
             
                if ( idx < 0 || idx >= ca->dim[i] ) {
         
     | 
| 
       252 
254 
     | 
    
         
             
                  return Qfalse;
         
     | 
| 
       253 
255 
     | 
    
         
             
                }
         
     | 
| 
         @@ -270,9 +272,11 @@ rb_ca_is_valid_addr (VALUE self, VALUE raddr) 
     | 
|
| 
       270 
272 
     | 
    
         | 
| 
       271 
273 
     | 
    
         
             
              Data_Get_Struct(self, CArray, ca);
         
     | 
| 
       272 
274 
     | 
    
         
             
              addr = NUM2SIZE(raddr);
         
     | 
| 
      
 275 
     | 
    
         
            +
            	/*
         
     | 
| 
       273 
276 
     | 
    
         
             
              if ( addr < 0 ) {
         
     | 
| 
       274 
277 
     | 
    
         
             
                addr += ca->elements;
         
     | 
| 
       275 
278 
     | 
    
         
             
              }
         
     | 
| 
      
 279 
     | 
    
         
            +
            	*/
         
     | 
| 
       276 
280 
     | 
    
         
             
              if ( addr < 0 || addr >= ca->elements ) {
         
     | 
| 
       277 
281 
     | 
    
         
             
                return Qfalse;
         
     | 
| 
       278 
282 
     | 
    
         
             
              }
         
     | 
    
        data/ext/extconf.rb
    CHANGED
    
    
    
        data/ext/version.h
    CHANGED
    
    | 
         @@ -8,9 +8,9 @@ 
     | 
|
| 
       8 
8 
     | 
    
         | 
| 
       9 
9 
     | 
    
         
             
            ---------------------------------------------------------------------------- */
         
     | 
| 
       10 
10 
     | 
    
         | 
| 
       11 
     | 
    
         
            -
            #define CA_VERSION "1.5. 
     | 
| 
       12 
     | 
    
         
            -
            #define CA_VERSION_CODE  
     | 
| 
      
 11 
     | 
    
         
            +
            #define CA_VERSION "1.5.5"
         
     | 
| 
      
 12 
     | 
    
         
            +
            #define CA_VERSION_CODE 155
         
     | 
| 
       13 
13 
     | 
    
         
             
            #define CA_VERSION_MAJOR 1
         
     | 
| 
       14 
14 
     | 
    
         
             
            #define CA_VERSION_MINOR 5
         
     | 
| 
       15 
     | 
    
         
            -
            #define CA_VERSION_TEENY  
     | 
| 
       16 
     | 
    
         
            -
            #define CA_VERSION_DATE " 
     | 
| 
      
 15 
     | 
    
         
            +
            #define CA_VERSION_TEENY 5
         
     | 
| 
      
 16 
     | 
    
         
            +
            #define CA_VERSION_DATE "2021/02/02"
         
     | 
    
        data/lib/carray.rb
    CHANGED
    
    | 
         @@ -60,7 +60,7 @@ unless $CARRAY_NO_AUTOLOAD 
     | 
|
| 
       60 
60 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_narray'
         
     | 
| 
       61 
61 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_numo_narray'
         
     | 
| 
       62 
62 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_io_csv'
         
     | 
| 
       63 
     | 
    
         
            -
              require 'carray/autoload/autoload_gem_io_sqlite3'
         
     | 
| 
      
 63 
     | 
    
         
            +
            #  require 'carray/autoload/autoload_gem_io_sqlite3'
         
     | 
| 
       64 
64 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_rmagick'
         
     | 
| 
       65 
65 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_cairo'
         
     | 
| 
       66 
66 
     | 
    
         
             
              require 'carray/autoload/autoload_gem_opencv'
         
     | 
    
        data/lib/carray/serialize.rb
    CHANGED
    
    | 
         @@ -84,7 +84,7 @@ class CArray::Serializer   # :nodoc: 
     | 
|
| 
       84 
84 
     | 
    
         
             
                end
         
     | 
| 
       85 
85 
     | 
    
         
             
              end
         
     | 
| 
       86 
86 
     | 
    
         | 
| 
       87 
     | 
    
         
            -
              def save (ca, opt 
     | 
| 
      
 87 
     | 
    
         
            +
              def save (ca, **opt)
         
     | 
| 
       88 
88 
     | 
    
         
             
                endian = opt[:endian] || CArray.endian
         
     | 
| 
       89 
89 
     | 
    
         
             
                # ---
         
     | 
| 
       90 
90 
     | 
    
         
             
                header = Header.new()
         
     | 
| 
         @@ -132,8 +132,8 @@ class CArray::Serializer   # :nodoc: 
     | 
|
| 
       132 
132 
     | 
    
         
             
                return ca
         
     | 
| 
       133 
133 
     | 
    
         
             
              end
         
     | 
| 
       134 
134 
     | 
    
         | 
| 
       135 
     | 
    
         
            -
              def load (opt 
     | 
| 
       136 
     | 
    
         
            -
                if legacy
         
     | 
| 
      
 135 
     | 
    
         
            +
              def load (**opt)
         
     | 
| 
      
 136 
     | 
    
         
            +
                if opt[:legacy]
         
     | 
| 
       137 
137 
     | 
    
         
             
                  header = Header_Legacy.decode(@io.read(256))
         
     | 
| 
       138 
138 
     | 
    
         
             
                else
         
     | 
| 
       139 
139 
     | 
    
         
             
                  header = Header.decode(@io.read(256))
         
     | 
| 
         @@ -191,36 +191,36 @@ end 
     | 
|
| 
       191 
191 
     | 
    
         | 
| 
       192 
192 
     | 
    
         
             
            class CArray
         
     | 
| 
       193 
193 
     | 
    
         | 
| 
       194 
     | 
    
         
            -
              def self.save(ca, output, opt 
     | 
| 
      
 194 
     | 
    
         
            +
              def self.save(ca, output, **opt)
         
     | 
| 
       195 
195 
     | 
    
         
             
                case output
         
     | 
| 
       196 
196 
     | 
    
         
             
                when String
         
     | 
| 
       197 
197 
     | 
    
         
             
                  open(output, "wb:ASCII-8BIT") { |io|
         
     | 
| 
       198 
     | 
    
         
            -
                    return Serializer.new(io).save(ca, opt)
         
     | 
| 
      
 198 
     | 
    
         
            +
                    return Serializer.new(io).save(ca, **opt)
         
     | 
| 
       199 
199 
     | 
    
         
             
                  }
         
     | 
| 
       200 
200 
     | 
    
         
             
                else
         
     | 
| 
       201 
     | 
    
         
            -
                  return Serializer.new(output).save(ca, opt) 
         
     | 
| 
      
 201 
     | 
    
         
            +
                  return Serializer.new(output).save(ca, **opt) 
         
     | 
| 
       202 
202 
     | 
    
         
             
                end
         
     | 
| 
       203 
203 
     | 
    
         
             
              end
         
     | 
| 
       204 
204 
     | 
    
         | 
| 
       205 
     | 
    
         
            -
              def self.load (input, opt 
     | 
| 
      
 205 
     | 
    
         
            +
              def self.load (input, **opt)
         
     | 
| 
       206 
206 
     | 
    
         
             
                case input
         
     | 
| 
       207 
207 
     | 
    
         
             
                when String
         
     | 
| 
       208 
208 
     | 
    
         
             
                  if input.length >= 256 and input =~ /\A_CARRAY_.{8}_(LE|BE)_/
         
     | 
| 
       209 
209 
     | 
    
         
             
                    io = StringIO.new(input)
         
     | 
| 
       210 
     | 
    
         
            -
                    return Serializer.new(io).load(opt)
         
     | 
| 
      
 210 
     | 
    
         
            +
                    return Serializer.new(io).load(**opt)
         
     | 
| 
       211 
211 
     | 
    
         
             
                  else
         
     | 
| 
       212 
212 
     | 
    
         
             
                    open(input, "rb:ASCII-8BIT") { |io|
         
     | 
| 
       213 
     | 
    
         
            -
                      return Serializer.new(io).load(opt)
         
     | 
| 
      
 213 
     | 
    
         
            +
                      return Serializer.new(io).load(**opt)
         
     | 
| 
       214 
214 
     | 
    
         
             
                    }
         
     | 
| 
       215 
215 
     | 
    
         
             
                  end
         
     | 
| 
       216 
216 
     | 
    
         
             
                else
         
     | 
| 
       217 
     | 
    
         
            -
                  return Serializer.new(input).load(opt)   
         
     | 
| 
      
 217 
     | 
    
         
            +
                  return Serializer.new(input).load(**opt)   
         
     | 
| 
       218 
218 
     | 
    
         
             
                end
         
     | 
| 
       219 
219 
     | 
    
         
             
              end
         
     | 
| 
       220 
220 
     | 
    
         | 
| 
       221 
     | 
    
         
            -
              def self.dump (ca, opt 
     | 
| 
      
 221 
     | 
    
         
            +
              def self.dump (ca, **opt)
         
     | 
| 
       222 
222 
     | 
    
         
             
                io = StringIO.new("")
         
     | 
| 
       223 
     | 
    
         
            -
                Serializer.new(io).save(ca, opt) 
         
     | 
| 
      
 223 
     | 
    
         
            +
                Serializer.new(io).save(ca, **opt) 
         
     | 
| 
       224 
224 
     | 
    
         
             
                return io.string
         
     | 
| 
       225 
225 
     | 
    
         
             
              end
         
     | 
| 
       226 
226 
     | 
    
         | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,14 +1,14 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: carray
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 1.5. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 1.5.5
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Hiroki Motoyoshi
         
     | 
| 
       8 
8 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       9 
9 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       10 
10 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       11 
     | 
    
         
            -
            date:  
     | 
| 
      
 11 
     | 
    
         
            +
            date: 2021-02-02 00:00:00.000000000 Z
         
     | 
| 
       12 
12 
     | 
    
         
             
            dependencies: []
         
     | 
| 
       13 
13 
     | 
    
         
             
            description: |2
         
     | 
| 
       14 
14 
     | 
    
         
             
                  Ruby/CArray is an extension library for the multi-dimensional numerical array
         
     |