[Git][debian-gis-team/ruby-hdfeos5][master] 4 commits: Update depends: ruby-narray >= 0.6.1.2-4
Youhei SASAKI (@uwabami)
gitlab at salsa.debian.org
Tue Nov 2 06:57:37 GMT 2021
Youhei SASAKI pushed to branch master at Debian GIS Project / ruby-hdfeos5
Commits:
31515afc by Youhei SASAKI at 2021-11-02T15:34:43+09:00
Update depends: ruby-narray >= 0.6.1.2-4
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
- - - - -
ff5f291a by Youhei SASAKI at 2021-11-02T15:43:02+09:00
Add Rules-Requires-Root: no
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
- - - - -
c1822260 by Youhei SASAKI at 2021-11-02T15:47:59+09:00
Refresh patches, add patch: change national encoding
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
- - - - -
03606c6b by Youhei SASAKI at 2021-11-02T15:56:59+09:00
Update d/changeog
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/patches/0001-Fix-NArray-Library-Path.patch
- debian/patches/0002-Fix-test-data-path.patch
- debian/patches/0003-Fix-printf-debugging.patch
- debian/patches/0004-hdf5-dir.patch
- debian/patches/0005-length-typo.patch
- debian/patches/0006-hid_t.patch
- debian/patches/0007-Drop-obsolete-rb_secure-rb_safe_level.patch
- + debian/patches/0008-Change-Encoding-Shift_JIS-to-UTF-8.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,18 +1,17 @@
-ruby-hdfeos5 (1.2-11) UNRELEASED; urgency=medium
+ruby-hdfeos5 (1.2-11) unstable; urgency=medium
[ Bas Couwenberg ]
- * Team upload.
+ * Fix control file.
* Bump watch file version to 4.
* Update lintian overrides.
* Bump Standards-Version to 4.6.0, no changes.
[ Youhei SASAKI ]
+ * Update depends: ruby-narray >= 0.6.1.2-4 (Closes: #996291)
+ * Refresh patches, add patch: change national encoding
* Remove empty leading paragraph in Description.
- * Bump debhelper from old 12 to 13.
- * Fix field name cases in debian/control (Architecture => Architecture, Source
- => Source).
- -- Bas Couwenberg <sebastic at debian.org> Fri, 06 Nov 2020 19:58:00 +0100
+ -- Youhei SASAKI <uwabami at gfd-dennou.org> Tue, 02 Nov 2021 15:50:00 +0900
ruby-hdfeos5 (1.2-10) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -3,18 +3,19 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Youhei SASAKI <uwabami at gfd-dennou.org>
Section: ruby
Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 12),
gem2deb,
libgctp-dev,
libhdf5-dev,
libhe5-hdfeos-dev,
- ruby-narray,
+ ruby-narray (>= 0.6.1.2-4),
ruby-narray-miss
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/ruby-hdfeos5
Vcs-Git: https://salsa.debian.org/debian-gis-team/ruby-hdfeos5.git
Homepage: https://www.gfd-dennou.org/arch/ruby/products/ruby-hdfeos5/
XS-Ruby-Versions: all
+Rules-Requires-Root: no
Package: ruby-hdfeos5
Architecture: any
=====================================
debian/patches/0001-Fix-NArray-Library-Path.patch
=====================================
@@ -1,6 +1,7 @@
From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Date: Fri, 5 Jul 2013 01:23:50 +0900
Subject: Fix NArray Library Path
+Forwarded: yes
In Debian, NArray was installed $vendorarchdir.
This patch fix search path for NArray.
=====================================
debian/patches/0002-Fix-test-data-path.patch
=====================================
@@ -1,6 +1,7 @@
From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Date: Fri, 5 Jul 2013 01:23:51 +0900
Subject: Fix test data path
+Forwarded: yes
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
=====================================
debian/patches/0003-Fix-printf-debugging.patch
=====================================
@@ -1,6 +1,7 @@
From: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Fri, 5 Jul 2013 01:30:20 +0900
Subject: Fix printf debugging
+Forwarded: yes
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
=====================================
debian/patches/0004-hdf5-dir.patch
=====================================
@@ -1,6 +1,7 @@
From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Date: Fri, 4 Sep 2015 14:56:31 +0900
Subject: hdf5-dir
+Forwarded: yes
---
extconf.rb | 17 ++++++++++-------
=====================================
debian/patches/0005-length-typo.patch
=====================================
@@ -1,6 +1,7 @@
From: Bas Couwenberg <sebastic at debian.org>
Date: Wed, 20 Oct 2021 13:09:41 +0900
Subject: Fix 'lengh' typo, replace with 'length'.
+Forwarded: yes
---
hdfeos5gd_wrap.c | 12 ++++++------
=====================================
debian/patches/0006-hid_t.patch
=====================================
@@ -1,6 +1,7 @@
From: Gilles Filippini <pini at debian.org>
Date: Wed, 20 Oct 2021 13:09:41 +0900
Subject: Add support for HDF5 1.10.
+Forwarded: yes
Bug-Debian: https://bugs.debian.org/846353
=====================================
debian/patches/0007-Drop-obsolete-rb_secure-rb_safe_level.patch
=====================================
@@ -1,19 +1,22 @@
From: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Wed, 20 Oct 2021 13:17:11 +0900
Subject: Drop obsolete rb_secure, rb_safe_level
+Forwarded: yes
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
hdfeos5gd_wrap.c | 163 +++++++++++++++------------------------------------
- hdfeos5main_wrap.c | 3 +-
+ hdfeos5main_wrap.c | 4 --
hdfeos5pt_wrap.c | 152 ++++++++++++++++--------------------------------
hdfeos5sw_wrap.c | 167 ++++++++++++-----------------------------------------
hdfeos5za_wrap.c | 118 ++++++++++---------------------------
- 5 files changed, 163 insertions(+), 440 deletions(-)
+ 5 files changed, 162 insertions(+), 442 deletions(-)
+diff --git a/hdfeos5gd_wrap.c b/hdfeos5gd_wrap.c
+index 4098ef0..15d714e 100644
--- a/hdfeos5gd_wrap.c
+++ b/hdfeos5gd_wrap.c
-@@ -326,7 +326,6 @@
+@@ -326,7 +326,6 @@ hdfeos5_gdcreate(VALUE mod, VALUE gridname, VALUE xdimsize, VALUE ydimsize, VALU
char* file;
VALUE Grid;
@@ -21,7 +24,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
file=he5file->name;
-@@ -366,7 +365,6 @@
+@@ -366,7 +365,6 @@ hdfeos5_gdattach(VALUE mod, VALUE gridname)
struct HE5Gd *he5grid;
VALUE Grid;
@@ -29,7 +32,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
i_fname=he5file->name;
-@@ -393,7 +391,6 @@
+@@ -393,7 +391,6 @@ hdfeos5_gddefdim(VALUE mod, VALUE dimname, VALUE dim)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -37,7 +40,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(dimname,T_STRING);
-@@ -418,7 +415,6 @@
+@@ -418,7 +415,6 @@ hdfeos5_gddefproj(VALUE mod, VALUE projcode, VALUE zonecode, VALUE spherecode, V
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -45,7 +48,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(projcode,T_STRING);
-@@ -448,7 +444,6 @@
+@@ -448,7 +444,6 @@ hdfeos5_gdblksomoffset(VALUE mod, VALUE offset, VALUE count, VALUE code)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -53,7 +56,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(code,T_STRING);
-@@ -480,7 +475,6 @@
+@@ -480,7 +475,6 @@ hdfeos5_gddefcomp(VALUE mod, VALUE compcode, VALUE compparm)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -61,7 +64,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -509,7 +503,6 @@
+@@ -509,7 +503,6 @@ hdfeos5_gddeftile(VALUE mod, VALUE tilecode, VALUE tilerank, VALUE tiledims)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -69,7 +72,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -542,7 +535,6 @@
+@@ -542,7 +535,6 @@ hdfeos5_gddefcomtile(VALUE mod, VALUE compcode, VALUE compparm, VALUE tilerank,
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -77,7 +80,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -577,7 +569,6 @@
+@@ -577,7 +569,6 @@ hdfeos5_gddeforigin(VALUE mod, VALUE origincode)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -85,7 +88,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -599,7 +590,6 @@
+@@ -599,7 +590,6 @@ hdfeos5_gddefpixreg(VALUE mod, VALUE pixregcode)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -93,7 +96,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -621,7 +611,6 @@
+@@ -621,7 +611,6 @@ hdfeos5_gddiminfo(VALUE mod, VALUE dimname)
VALUE ndim;
struct HE5Gd *he5grid;
@@ -101,7 +104,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -650,12 +639,11 @@
+@@ -650,12 +639,11 @@ hdfeos5_gdgridinfo(VALUE mod)
VALUE lowrightpt;
struct HE5Gd *he5grid;
@@ -116,7 +119,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDgridinfo(i_gridid, &o_xdimsize, &o_ydimsize, o_datbuf1, o_datbuf2);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
xdimsize = LONG2NUM(o_xdimsize);
-@@ -679,11 +667,10 @@
+@@ -679,11 +667,10 @@ hdfeos5_gdprojinfo(VALUE mod)
VALUE projparm;
struct HE5Gd *he5grid;
@@ -129,7 +132,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDprojinfo(i_gridid, &o_projcode, &o_zonecode, &o_spherecode, o_projparm);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
change_projtype(o_projcode,str);
-@@ -703,7 +690,6 @@
+@@ -703,7 +690,6 @@ hdfeos5_gdorigininfo(VALUE mod)
VALUE origincode;
struct HE5Gd *he5grid;
@@ -137,7 +140,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -724,7 +710,6 @@
+@@ -724,7 +710,6 @@ hdfeos5_gdpixreginfo(VALUE mod)
VALUE pixregcode;
struct HE5Gd *he5grid;
@@ -145,7 +148,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -750,14 +735,13 @@
+@@ -750,14 +735,13 @@ hdfeos5_gdcompinfo(VALUE mod)
VALUE compparm;
VALUE rtn_val;
struct HE5GdField *he5field;
@@ -162,7 +165,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDcompinfo(i_gridid, i_fldname, &o_compcode, o_compparm);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
change_comptype(o_compcode,str);
-@@ -783,7 +767,6 @@
+@@ -783,7 +767,6 @@ hdfeos5_gdfieldinfo(VALUE mod)
VALUE dimlist;
struct HE5GdField *he5field;
@@ -170,7 +173,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -814,7 +797,6 @@
+@@ -814,7 +797,6 @@ hdfeos5_gdtileinfo(VALUE mod)
VALUE tiledims;
struct HE5GdField *he5field;
@@ -178,7 +181,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -843,7 +825,6 @@
+@@ -843,7 +825,6 @@ hdfeos5_gddeffield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimlist,
struct HE5GdField *he5field;
struct HE5Gd *he5grid;
@@ -186,7 +189,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -882,7 +863,6 @@
+@@ -882,7 +863,6 @@ hdfeos5_gdwritefieldmeta(VALUE mod, VALUE dimlist, VALUE numbertype)
VALUE rtn_val;
struct HE5GdField *he5field;
@@ -194,7 +197,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1015,7 +995,6 @@
+@@ -1015,7 +995,6 @@ hdfeos5_gdwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -202,7 +205,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1030,7 +1009,7 @@
+@@ -1030,7 +1009,7 @@ hdfeos5_gdwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -211,7 +214,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDwriteattr(i_gridid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1049,7 +1028,6 @@
+@@ -1049,7 +1028,6 @@ hdfeos5_gd_get_att(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Gd *he5grid;
@@ -219,7 +222,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1059,7 +1037,7 @@
+@@ -1059,7 +1037,7 @@ hdfeos5_gd_get_att(VALUE mod, VALUE attrname)
o_rtn_val = HE5_GDattrinfo(i_gridid, i_attrname, &o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -228,7 +231,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDreadattr(i_gridid, i_attrname, o_datbuf);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
return result;
-@@ -1077,7 +1055,6 @@
+@@ -1077,7 +1055,6 @@ hdfeos5_gdinqgrid(VALUE mod)
VALUE strbufsize;
struct HE5 *he5file;
@@ -236,7 +239,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1105,7 +1082,6 @@
+@@ -1105,7 +1082,6 @@ hdfeos5_gdsetfillvalue(VALUE mod, VALUE fieldname, VALUE numbertype, VALUE fillv
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -244,7 +247,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1143,7 +1119,6 @@
+@@ -1143,7 +1119,6 @@ hdfeos5_gdgetfillvalue(VALUE mod,VALUE fieldname)
VALUE fillval;
struct HE5Gd *he5grid;
@@ -252,7 +255,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1176,7 +1151,6 @@
+@@ -1176,7 +1151,6 @@ hdfeos5_gdinqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
VALUE size;
struct HE5Gd *he5grid;
@@ -260,7 +263,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1212,7 +1186,6 @@
+@@ -1212,7 +1186,6 @@ hdfeos5_gdnentries(VALUE mod, VALUE entrycode)
VALUE strbufsize;
struct HE5Gd *he5grid;
@@ -268,7 +271,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1242,7 +1215,6 @@
+@@ -1242,7 +1215,6 @@ hdfeos5_gdinqdims(VALUE mod, VALUE entrycode)
VALUE dims;
struct HE5Gd *he5grid;
@@ -276,7 +279,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1251,7 +1223,7 @@
+@@ -1251,7 +1223,7 @@ hdfeos5_gdinqdims(VALUE mod, VALUE entrycode)
hs_dims = ALLOCA_N(unsigned long long, i_count);
o_dimnames = ALLOCA_N(char,(i_strbufsize + 1));
@@ -285,7 +288,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_ndims = HE5_GDinqdims(i_gridid, o_dimnames, hs_dims);
if(o_ndims < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
ndims = LONG2NUM(o_ndims);
-@@ -1273,7 +1245,6 @@
+@@ -1273,7 +1245,6 @@ hdfeos5_gdinqattrs(VALUE mod)
VALUE strbufsize;
struct HE5Gd *he5grid;
@@ -293,7 +296,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1306,7 +1277,6 @@
+@@ -1306,7 +1277,6 @@ hdfeos5_gdinqfields(VALUE mod, VALUE entrycode)
VALUE ntype;
struct HE5Gd *he5grid;
@@ -301,7 +304,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1319,12 +1289,12 @@
+@@ -1319,12 +1289,12 @@ hdfeos5_gdinqfields(VALUE mod, VALUE entrycode)
o_nflds = HE5_GDinqfields(i_gridid, o_fieldlist, o_rank, NULL);
if (o_nflds < 0 ) return Qfalse ;
@@ -316,7 +319,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_count = (int)o_nflds;
rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
-@@ -1340,7 +1310,6 @@
+@@ -1340,7 +1310,6 @@ hdfeos5_gddetach(VALUE mod)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -324,7 +327,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1372,7 +1341,6 @@
+@@ -1372,7 +1341,6 @@ hdfeos5_gdrs2ll(VALUE mod, VALUE projcode, VALUE projparm, VALUE xdimsize, VALUE
VALUE latitude;
struct HE5Gd *he5grid;
@@ -332,7 +335,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1410,8 +1378,8 @@
+@@ -1410,8 +1378,8 @@ hdfeos5_gdrs2ll(VALUE mod, VALUE projcode, VALUE projparm, VALUE xdimsize, VALUE
}
i_s = hdfeos5_obj2cfloatary(s);
@@ -343,7 +346,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDrs2ll(i_projcode, (double*)i_projparm, i_xdimsize, i_ydimsize, (double*)i_upleft, (double*)i_lowright, i_npnts, (double*)i_r, (double*)i_s, o_longitude, o_latitude, i_pixcen, i_pixcnr);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
-@@ -1435,7 +1403,6 @@
+@@ -1435,7 +1403,6 @@ hdfeos5_gddefboxregion(VALUE mod, VALUE cornerlon, VALUE cornerlat)
VALUE regionID;
struct HE5Gd *he5grid;
@@ -351,7 +354,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1478,7 +1445,6 @@
+@@ -1478,7 +1445,6 @@ hdfeos5_gdregioninfo(VALUE mod, VALUE regionid)
VALUE lowrightpt;
struct HE5GdField *he5field;
@@ -359,7 +362,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1486,8 +1452,8 @@
+@@ -1486,8 +1452,8 @@ hdfeos5_gdregioninfo(VALUE mod, VALUE regionid)
Check_Type(regionid,T_FIXNUM);
i_regionid = NUM2INT(regionid);
@@ -370,7 +373,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDregioninfo(i_gridid, i_regionid, i_fieldname, &o_ntype, &o_rank, o_dims, &o_size, o_upleftpt, o_lowrightpt);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
change_chartype(o_ntype, str);
-@@ -1510,7 +1476,6 @@
+@@ -1510,7 +1476,6 @@ hdfeos5_gdextractregion(VALUE mod, VALUE regionid)
VALUE buffer;
struct HE5GdField *he5field;
@@ -378,7 +381,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1552,7 +1517,6 @@
+@@ -1552,7 +1517,6 @@ hdfeos5_gddefvrtregion(VALUE mod, VALUE regionid, VALUE vertobj, VALUE range)
hid_t o_rtn_val;
struct HE5Gd *he5grid;
@@ -386,7 +389,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1584,7 +1548,6 @@
+@@ -1584,7 +1548,6 @@ hdfeos5_gddeftimeperiod(VALUE mod, VALUE periodid, VALUE starttime, VALUE stopti
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -394,7 +397,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1618,7 +1581,6 @@
+@@ -1618,7 +1581,6 @@ hdfeos5_gdgetpixels(VALUE mod, VALUE nlonlat, VALUE lonval, VALUE latval)
VALUE pixval;
struct HE5Gd *he5grid;
@@ -402,7 +405,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1633,8 +1595,8 @@
+@@ -1633,8 +1595,8 @@ hdfeos5_gdgetpixels(VALUE mod, VALUE nlonlat, VALUE lonval, VALUE latval)
}
i_latval = hdfeos5_obj2cfloatary(latval);
@@ -413,7 +416,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDgetpixels(i_gridid, i_nlonlat, (double*)i_lonval, (double*)i_latval, o_pixrow, o_pixval);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",
__FILE__,__LINE__);
-@@ -1657,7 +1619,6 @@
+@@ -1657,7 +1619,6 @@ hdfeos5_gdgetpixvalues(VALUE mod, VALUE npixels, VALUE pixrow, VALUE pixcol)
VALUE buffer;
struct HE5GdField *he5field;
@@ -421,7 +424,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1692,7 +1653,6 @@
+@@ -1692,7 +1653,6 @@ hdfeos5_gdinterpolate(VALUE mod, VALUE nvalues, VALUE lonval, VALUE latval)
VALUE interpval;
struct HE5GdField *he5field;
@@ -429,7 +432,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1708,7 +1668,7 @@
+@@ -1708,7 +1668,7 @@ hdfeos5_gdinterpolate(VALUE mod, VALUE nvalues, VALUE lonval, VALUE latval)
}
i_latval = (double*)hdfeos5_obj2cfloatary(latval);
@@ -438,7 +441,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDinterpolate(i_gridid, i_nvalues, i_lonval, i_latval, i_fieldname, o_interpval);
hdfeos5_freecfloatary((float*)i_lonval);
hdfeos5_freecfloatary((float*)i_latval);
-@@ -1731,7 +1691,6 @@
+@@ -1731,7 +1691,6 @@ hdfeos5_gdwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5GdField *he5field;
@@ -446,7 +449,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1747,7 +1706,7 @@
+@@ -1747,7 +1706,7 @@ hdfeos5_gdwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -455,7 +458,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDwritelocattr(i_gridid, i_fieldname, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1767,7 +1726,6 @@
+@@ -1767,7 +1726,6 @@ hdfeos5_gdfield_get_att(VALUE mod,VALUE attrname)
unsigned long long o_count;
struct HE5GdField *he5field;
@@ -463,7 +466,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -1775,7 +1733,7 @@
+@@ -1775,7 +1733,7 @@ hdfeos5_gdfield_get_att(VALUE mod,VALUE attrname)
SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
@@ -472,7 +475,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
&o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",
__FILE__,__LINE__);
-@@ -1800,14 +1758,13 @@
+@@ -1800,14 +1758,13 @@ hdfeos5_gdinqlocattrs(VALUE mod)
VALUE strbufsize;
struct HE5GdField *he5field;
@@ -488,7 +491,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_attrnames = ALLOCA_N(char, (o_strbufsize + 1));
o_nattr = HE5_GDinqlocattrs(i_gridid, i_fieldname, o_attrnames, &o_strbufsize);
if(o_nattr < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -1830,7 +1787,6 @@
+@@ -1830,7 +1787,6 @@ hdfeos5_gdwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -496,7 +499,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1846,7 +1802,7 @@
+@@ -1846,7 +1802,7 @@ hdfeos5_gdwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_count = hdfeos5_obj2cunsint64ary(count);
i_datbuf = hdfeos5_obj2cfloatary(datbuf);
@@ -505,7 +508,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_GDwritegrpattr(i_gridid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1865,7 +1821,6 @@
+@@ -1865,7 +1821,6 @@ hdfeos5_gd_get_grpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Gd *he5grid;
@@ -513,7 +516,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1892,7 +1847,6 @@
+@@ -1892,7 +1847,6 @@ hdfeos5_gdsetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -521,7 +524,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1932,7 +1886,6 @@
+@@ -1932,7 +1886,6 @@ hdfeos5_gdgetextdata(VALUE mod, VALUE fieldname)
VALUE size;
struct HE5Gd *he5grid;
@@ -529,7 +532,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1943,7 +1896,7 @@
+@@ -1943,7 +1896,7 @@ hdfeos5_gdgetextdata(VALUE mod, VALUE fieldname)
o_nfiles = HE5_GDgetextdata(i_gridid, i_fieldname, o_namelength, o_filelist, o_offset, o_size);
nfiles = INT2NUM(o_nfiles);
@@ -538,7 +541,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
namelength = hdfeos5_cintary2obj((int*)o_namelength,o_nfiles,1,&o_nfiles);
filelist = hdfeos5_ccharary2obj(o_filelist,o_nfiles,o_nfiles);
offset = hdfeos5_cunsint64ary2obj(o_offset,o_nfiles,1,&o_nfiles);
-@@ -1962,7 +1915,6 @@
+@@ -1962,7 +1915,6 @@ hdfeos5_gdsetalias(VALUE mod, VALUE fieldname)
VALUE aliaslist;
struct HE5Gd *he5grid;
@@ -546,7 +549,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -1986,7 +1938,6 @@
+@@ -1986,7 +1938,6 @@ hdfeos5_gddropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE rtn_val;
struct HE5Gd *he5grid;
@@ -554,7 +557,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -2017,7 +1968,6 @@
+@@ -2017,7 +1968,6 @@ hdfeos5_gdaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE buffer;
struct HE5Gd *he5grid;
@@ -562,7 +565,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -2051,7 +2001,6 @@
+@@ -2051,7 +2001,6 @@ hdfeos5_gdinqfldalias(VALUE mod)
VALUE strbufsize;
struct HE5Gd *he5grid;
@@ -570,7 +573,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -2076,7 +2025,6 @@
+@@ -2076,7 +2025,6 @@ hdfeos5_gdgetaliaslist(VALUE mod, VALUE fldgroup)
VALUE strbufsize;
struct HE5Gd *he5grid;
@@ -578,7 +581,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
-@@ -2099,7 +2047,6 @@
+@@ -2099,7 +2047,6 @@ hdfeos5_swchkgrid(VALUE mod)
long o_rtn_val;
struct HE5 *he5file;
@@ -586,7 +589,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -2118,7 +2065,6 @@
+@@ -2118,7 +2065,6 @@ hdfeos5_swchkgridname(VALUE mod)
VALUE rstr;
struct HE5 *he5file;
@@ -594,7 +597,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -2140,14 +2086,13 @@
+@@ -2140,14 +2086,13 @@ hdfeos5_gdsetfield(VALUE mod,VALUE fieldname)
struct HE5Gd *he5grid;
struct HE5GdField *he5field;
@@ -610,7 +613,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
he5field = HE5GdField_init(i_fieldname, i_gridid, mod);
return(Data_Wrap_Struct(cHE5GdField, he5gdfield_mark_obj, HE5GdField_free, he5field));
}
-@@ -2158,14 +2103,13 @@
+@@ -2158,14 +2103,13 @@ hdfeos5_gdgetfield(VALUE mod)
char *i_fieldname;
struct HE5GdField *he5field;
@@ -626,7 +629,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
hdfeos5_grid_whether_in_define_mode(VALUE gd)
{
int fid;
-@@ -2174,7 +2118,7 @@
+@@ -2174,7 +2118,7 @@ hdfeos5_grid_whether_in_define_mode(VALUE gd)
uintn access = 0;
int status;
struct HE5Gd *he5grid;
@@ -635,7 +638,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(gd, struct HE5Gd, he5grid);
fid=he5grid->fid;
-@@ -2196,7 +2140,7 @@
+@@ -2196,7 +2140,7 @@ hdfeos5_gd_path(VALUE gd)
{
char *i_name;
struct HE5Gd *he5grid;
@@ -644,7 +647,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(gd, struct HE5Gd, he5grid);
i_name=he5grid->name;
-@@ -2208,7 +2152,7 @@
+@@ -2208,7 +2152,7 @@ hdfeos5_gd_inqname(VALUE gd)
{
char *i_name;
struct HE5Gd *he5grid;
@@ -653,7 +656,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(gd, struct HE5Gd, he5grid);
i_name=he5grid->name;
-@@ -2219,8 +2163,7 @@
+@@ -2219,8 +2163,7 @@ VALUE
hdfeos5_gd_file(VALUE gd)
{
struct HE5Gd *he5grid;
@@ -663,7 +666,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(gd, struct HE5Gd, he5grid);
return(he5grid->file);
}
-@@ -2230,7 +2173,6 @@
+@@ -2230,7 +2173,6 @@ hdfeos5_gdfld_grid(VALUE field)
{
struct HE5GdField *he5field;
@@ -671,7 +674,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5GdField, he5field);
return(he5field->grid);
}
-@@ -2241,7 +2183,6 @@
+@@ -2241,7 +2183,6 @@ hdfeos5_gdfld_inqname(VALUE field)
char *i_name;
struct HE5GdField *he5field;
@@ -679,7 +682,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5GdField, he5field);
i_name=he5field->name;
-@@ -2269,7 +2210,6 @@
+@@ -2269,7 +2210,6 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
unsigned char scalar,*i_data;
struct HE5GdField *he5field;
@@ -687,7 +690,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2282,7 +2222,7 @@
+@@ -2282,7 +2222,7 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -696,7 +699,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2335,7 +2275,7 @@
+@@ -2335,7 +2275,7 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
i_data = ALLOCA_N(unsigned char,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -705,7 +708,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2365,7 +2305,6 @@
+@@ -2365,7 +2305,6 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
short scalar,*i_data;
struct HE5GdField *he5field;
@@ -713,7 +716,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2378,7 +2317,7 @@
+@@ -2378,7 +2317,7 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -722,7 +725,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2431,7 +2370,7 @@
+@@ -2431,7 +2370,7 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
i_data = ALLOCA_N(short,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -731,7 +734,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2461,7 +2400,6 @@
+@@ -2461,7 +2400,6 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
int scalar,*i_data;
struct HE5GdField *he5field;
@@ -739,7 +742,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2474,7 +2412,7 @@
+@@ -2474,7 +2412,7 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -748,7 +751,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2527,7 +2465,7 @@
+@@ -2527,7 +2465,7 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
i_data = ALLOCA_N(int,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -757,7 +760,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2557,7 +2495,6 @@
+@@ -2557,7 +2495,6 @@ hdfeos5_gdwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
long scalar,*i_data;
struct HE5GdField *he5field;
@@ -765,7 +768,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2623,7 +2560,7 @@
+@@ -2623,7 +2560,7 @@ hdfeos5_gdwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
i_data = ALLOCA_N(long,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -774,7 +777,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2653,7 +2590,6 @@
+@@ -2653,7 +2590,6 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
float scalar,*i_data;
struct HE5GdField *he5field;
@@ -782,7 +785,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2666,7 +2602,7 @@
+@@ -2666,7 +2602,7 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -791,7 +794,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2719,7 +2655,7 @@
+@@ -2719,7 +2655,7 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
i_data = ALLOCA_N(float,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -800,7 +803,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2749,7 +2685,6 @@
+@@ -2749,7 +2685,6 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
double scalar,*i_data;
struct HE5GdField *he5field;
@@ -808,7 +811,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2762,7 +2697,7 @@
+@@ -2762,7 +2697,7 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -817,7 +820,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2815,7 +2750,7 @@
+@@ -2815,7 +2750,7 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
i_data = ALLOCA_N(double,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -826,7 +829,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
status = HE5_GDwritefield(i_gridid, i_fldname, c_start, c_stride, c_edge, i_data);
-@@ -2843,7 +2778,6 @@
+@@ -2843,7 +2778,6 @@ hdfeos5_gdreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -834,7 +837,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2857,7 +2791,7 @@
+@@ -2857,7 +2791,7 @@ hdfeos5_gdreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -843,7 +846,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2957,7 +2891,6 @@
+@@ -2957,7 +2891,6 @@ hdfeos5_gdreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -851,7 +854,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -2971,7 +2904,7 @@
+@@ -2971,7 +2904,7 @@ hdfeos5_gdreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -860,7 +863,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3071,7 +3004,6 @@
+@@ -3071,7 +3004,6 @@ hdfeos5_gdreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -868,7 +871,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -3085,7 +3017,7 @@
+@@ -3085,7 +3017,7 @@ hdfeos5_gdreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -877,7 +880,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3185,7 +3117,6 @@
+@@ -3185,7 +3117,6 @@ hdfeos5_gdreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -885,7 +888,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -3199,7 +3130,7 @@
+@@ -3199,7 +3130,7 @@ hdfeos5_gdreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -894,7 +897,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3299,7 +3230,6 @@
+@@ -3299,7 +3230,6 @@ hdfeos5_gdreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -902,7 +905,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -3313,7 +3243,7 @@
+@@ -3313,7 +3243,7 @@ hdfeos5_gdreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -911,7 +914,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3413,7 +3343,6 @@
+@@ -3413,7 +3343,6 @@ hdfeos5_gdreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5GdField *he5field;
@@ -919,7 +922,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5GdField, he5field);
i_fldname=he5field->name;
i_gridid=he5field->gdid;
-@@ -3427,7 +3356,7 @@
+@@ -3427,7 +3356,7 @@ hdfeos5_gdreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -928,7 +931,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3597,7 +3526,7 @@
+@@ -3597,7 +3526,7 @@ init_hdfeos5gd_wrap(void)
rb_define_method(cHE5GdField, "put_vars_float", hdfeos5_gdwritefield_float, 4);
rb_define_method(cHE5GdField, "put_vars_double", hdfeos5_gdwritefield_double, 4);
rb_define_method(cHE5GdField, "put_vars_short", hdfeos5_gdwritefield_short, 4);
@@ -937,9 +940,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
rb_define_method(cHE5GdField, "get_vars_char", hdfeos5_gdreadfield_char, 3);
rb_define_method(cHE5GdField, "get_vars_int", hdfeos5_gdreadfield_int, 3);
rb_define_method(cHE5GdField, "get_vars_long", hdfeos5_gdreadfield_long, 3);
+diff --git a/hdfeos5main_wrap.c b/hdfeos5main_wrap.c
+index e943aef..5b2a3d2 100644
--- a/hdfeos5main_wrap.c
+++ b/hdfeos5main_wrap.c
-@@ -99,7 +99,6 @@
+@@ -99,7 +99,6 @@ hdfeos5_path(VALUE file)
char *i_name;
struct HE5 *he5file;
@@ -947,7 +952,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5, he5file);
i_name=he5file->name;
-@@ -113,9 +112,6 @@
+@@ -113,9 +112,6 @@ hdfeos5_close(VALUE file)
herr_t o_rtn_val;
struct HE5 *he5file;
@@ -957,9 +962,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5, he5file);
i_fid=he5file->fid;
+diff --git a/hdfeos5pt_wrap.c b/hdfeos5pt_wrap.c
+index d052663..4fed64f 100644
--- a/hdfeos5pt_wrap.c
+++ b/hdfeos5pt_wrap.c
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ VALUE hdfeos5_ptupdatelevel_double(VALUE, VALUE, VALUE, VALUE);
ptr = (int32_t *) NA_PTR(na,0); \
len = na->total; \
shape = na->shape; \
@@ -968,7 +975,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
#define Array_to_Clong_len_shape(obj, ptr, len, shape) \
{ \
struct NARRAY *na; \
-@@ -168,7 +168,7 @@
+@@ -168,7 +168,7 @@ static VALUE cHE5;
static VALUE cHE5Pt;
static VALUE cHE5PtField;
@@ -977,7 +984,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
hid_t fid;
char *name;
int closed;
-@@ -264,7 +264,7 @@
+@@ -264,7 +264,7 @@ search_levelsize(hid_t i_ptid, char *i_fieldname)
if(i_nlevels < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<i_nlevels;i++) {
@@ -986,7 +993,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(j=0;j<dtsinfo.nfields;j++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[j])==0){
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,7 @@ search_levelname(hid_t i_ptid, char *i_fieldname)
if(i_nlevels < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<i_nlevels;i++) {
@@ -995,7 +1002,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(j=0;j<dtsinfo.nfields;j++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[j])==0){
-@@ -325,10 +325,10 @@
+@@ -325,10 +325,10 @@ sort_data_byte(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(char,shape_child);
@@ -1008,7 +1015,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, H5T_NATIVE_CHAR, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -357,10 +357,10 @@
+@@ -357,10 +357,10 @@ sort_data_short(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(short,shape_child);
@@ -1021,7 +1028,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, H5T_NATIVE_SHORT, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -389,10 +389,10 @@
+@@ -389,10 +389,10 @@ sort_data_int(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(int,shape_child);
@@ -1034,7 +1041,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, HE5T_NATIVE_INT, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -421,10 +421,10 @@
+@@ -421,10 +421,10 @@ sort_data_long(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(long,shape_child);
@@ -1047,7 +1054,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, H5T_NATIVE_LONG, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -453,10 +453,10 @@
+@@ -453,10 +453,10 @@ sort_data_float(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(float,shape_child);
@@ -1060,7 +1067,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, H5T_NATIVE_FLOAT, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -485,10 +485,10 @@
+@@ -485,10 +485,10 @@ sort_data_double(hid_t i_ptid, int i_level, char* o_linkfield,const int* shape)
shape_child=HE5_PTnrecs(i_ptid, i_level+1);
o_data_child=ALLOCA_N(double,shape_child);
@@ -1073,7 +1080,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
status = HE5_PTreadlevelF(i_ptid, i_level+1, o_linkfield, H5T_NATIVE_DOUBLE, o_data_child);
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -539,7 +539,6 @@
+@@ -539,7 +539,6 @@ hdfeos5_ptcreate(VALUE mod, VALUE pointname)
char* file;
VALUE Point;
@@ -1081,7 +1088,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
file=he5file->name;
-@@ -565,7 +564,6 @@
+@@ -565,7 +564,6 @@ hdfeos5_ptattach(VALUE mod, VALUE pointname)
struct HE5Pt *he5point;
VALUE Point;
@@ -1089,7 +1096,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
i_fname=he5file->name;
-@@ -590,7 +588,6 @@
+@@ -590,7 +588,6 @@ hdfeos5_ptdetach(VALUE mod)
VALUE rtn_val;
struct HE5Pt *he5point;
@@ -1097,7 +1104,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -608,7 +605,6 @@
+@@ -608,7 +605,6 @@ hdfeos5_ptnrecs(VALUE mod, VALUE level)
VALUE nrec;
struct HE5Pt *he5point;
@@ -1105,7 +1112,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
Check_Type(level,T_FIXNUM);
-@@ -627,7 +623,6 @@
+@@ -627,7 +623,6 @@ hdfeos5_ptnlevels(VALUE mod)
VALUE nlevels;
struct HE5Pt *he5point;
@@ -1113,7 +1120,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -653,7 +648,6 @@
+@@ -653,7 +648,6 @@ hdfeos5_ptnfields(VALUE mod)
VALUE nflds;
struct HE5Pt *he5point;
@@ -1121,7 +1128,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -699,7 +693,6 @@
+@@ -699,7 +693,6 @@ hdfeos5_ptgetlevelname(VALUE mod)
VALUE levelname;
struct HE5Pt *he5point;
@@ -1129,7 +1136,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -741,7 +734,7 @@
+@@ -741,7 +734,7 @@ hdfeos5_ptdeflevel(VALUE file, VALUE levelname, VALUE nfields, VALUE rank, VALUE
char *i_fieldlist;
long *i_dimlist;
char *i_datatype;
@@ -1138,7 +1145,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
char i_dtypecheck[HE5_HDFE_UTLBUFSIZE];
int *i_array;
int o_rtn_val;
-@@ -750,7 +743,6 @@
+@@ -750,7 +743,6 @@ hdfeos5_ptdeflevel(VALUE file, VALUE levelname, VALUE nfields, VALUE rank, VALUE
size_t slen[maxcharsize];
char *pntr[maxcharsize];
@@ -1146,7 +1153,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
struct HE5Pt *he5point;
Data_Get_Struct(file, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -804,7 +796,6 @@
+@@ -804,7 +796,6 @@ hdfeos5_ptdeflinkage(VALUE file, VALUE parent_level, VALUE child_level,VALUE lin
herr_t o_rtn_val;
VALUE rtn_val;
@@ -1154,7 +1161,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
struct HE5Pt *he5point;
Data_Get_Struct(file, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -888,7 +879,6 @@
+@@ -888,7 +879,6 @@ hdfeos5_ptwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
VALUE rtn_val;
struct HE5Pt *he5point;
@@ -1162,7 +1169,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -903,7 +893,7 @@
+@@ -903,7 +893,7 @@ hdfeos5_ptwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -1171,7 +1178,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_PTwriteattr(i_ptid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -922,7 +912,6 @@
+@@ -922,7 +912,6 @@ hdfeos5_pt_get_att(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Pt *he5point;
@@ -1179,7 +1186,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -932,7 +921,7 @@
+@@ -932,7 +921,7 @@ hdfeos5_pt_get_att(VALUE mod, VALUE attrname)
o_rtn_val = HE5_PTattrinfo(i_ptid, i_attrname, &o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1188,7 +1195,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_PTreadattr(i_ptid, i_attrname, o_datbuf);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
return result;
-@@ -961,18 +950,17 @@
+@@ -961,18 +950,17 @@ hdfeos5_ptfieldinfo(VALUE mod)
VALUE fieldname;
struct HE5PtField *he5point;
@@ -1209,7 +1216,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
-@@ -1063,7 +1051,6 @@
+@@ -1063,7 +1051,6 @@ hdfeos5_ptinqdatatype(VALUE mod, VALUE levelname, VALUE attrname, VALUE group)
VALUE size;
struct HE5Pt *he5point;
@@ -1217,7 +1224,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -1098,7 +1085,6 @@
+@@ -1098,7 +1085,6 @@ hdfeos5_ptinqpoint(VALUE mod)
VALUE strbufsize;
struct HE5 *he5file;
@@ -1225,7 +1232,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1127,7 +1113,6 @@
+@@ -1127,7 +1113,6 @@ hdfeos5_ptinqattrs(VALUE mod)
VALUE strbufsize;
struct HE5Pt *he5point;
@@ -1233,7 +1240,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -1157,7 +1142,6 @@
+@@ -1157,7 +1142,6 @@ hdfeos5_ptwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5Pt *he5point;
@@ -1241,7 +1248,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -1172,7 +1156,7 @@
+@@ -1172,7 +1156,7 @@ hdfeos5_ptwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -1250,7 +1257,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_PTwritegrpattr(i_ptid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1191,7 +1175,6 @@
+@@ -1191,7 +1175,6 @@ hdfeos5_pt_get_grpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Pt *he5point;
@@ -1258,7 +1265,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -1219,7 +1202,6 @@
+@@ -1219,7 +1202,6 @@ hdfeos5_ptinqgrpattrs(VALUE mod)
VALUE strbufsize;
struct HE5Pt *he5point;
@@ -1266,7 +1273,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5point);
i_ptid=he5point->ptid;
-@@ -1249,7 +1231,6 @@
+@@ -1249,7 +1231,6 @@ hdfeos5_ptwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5PtField *he5point;
@@ -1274,7 +1281,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_ptid=he5point->ptid;
-@@ -1265,7 +1246,7 @@
+@@ -1265,7 +1246,7 @@ hdfeos5_ptwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -1283,7 +1290,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_PTwritelocattr(i_ptid, i_levelname, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecintary((int*)i_count);
-@@ -1285,7 +1266,6 @@
+@@ -1285,7 +1266,6 @@ hdfeos5_ptfield_get_att(VALUE mod,VALUE attrname)
unsigned long long o_count;
struct HE5PtField *he5point;
@@ -1291,7 +1298,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_ptid=he5point->ptid;
-@@ -1293,7 +1273,7 @@
+@@ -1293,7 +1273,7 @@ hdfeos5_ptfield_get_att(VALUE mod,VALUE attrname)
SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
@@ -1300,7 +1307,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
&o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",
__FILE__,__LINE__);
-@@ -1318,14 +1298,13 @@
+@@ -1318,14 +1298,13 @@ hdfeos5_ptinqlocattrs(VALUE mod)
VALUE strbufsize;
struct HE5PtField *he5point;
@@ -1316,7 +1323,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_attrnames = ALLOCA_N(char, (o_strbufsize + 1)*sizeof(char));
o_nattr = HE5_PTinqlocattrs(i_ptid, i_levelname, o_attrnames, &o_strbufsize);
if(o_nattr == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]", __FILE__,__LINE__);
-@@ -1346,7 +1325,6 @@
+@@ -1346,7 +1325,6 @@ hdfeos5_ptbcklinkinfo(VALUE mod)
struct HE5PtField *he5point;
VALUE linkfield;
@@ -1324,7 +1331,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_ptid=he5point->ptid;
i_levelname=he5point->levelname;
-@@ -1371,7 +1349,6 @@
+@@ -1371,7 +1349,6 @@ hdfeos5_ptfwdlinkinfo(VALUE mod)
struct HE5PtField *he5point;
VALUE linkfield;
@@ -1332,7 +1339,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_ptid=he5point->ptid;
i_levelname=he5point->levelname;
-@@ -1394,7 +1371,6 @@
+@@ -1394,7 +1371,6 @@ hdfeos5_ptlevelindx(VALUE mod)
VALUE levelnumber;
struct HE5PtField *he5point;
@@ -1340,7 +1347,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_ptid=he5point->ptid;
-@@ -1464,7 +1440,6 @@
+@@ -1464,7 +1440,6 @@ hdfeos5_ptchkpoint(VALUE mod)
long o_rtn_val;
struct HE5 *he5file;
@@ -1348,7 +1355,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1483,14 +1458,13 @@
+@@ -1483,14 +1458,13 @@ hdfeos5_ptchkpointname(VALUE mod)
VALUE rstr;
struct HE5 *he5file;
@@ -1364,7 +1371,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_PTinqpoint(i_filename, o_pointlist, &o_strbufsize);
if( o_rtn_val <= 0) return Qfalse;
rstr = rb_str_new(o_pointlist, o_strbufsize);
-@@ -1509,7 +1483,6 @@
+@@ -1509,7 +1483,6 @@ hdfeos5_ptchkfieldname(VALUE mod,VALUE levelname)
struct HE5Pt *he5pt;
VALUE fieldlist;
@@ -1372,7 +1379,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5pt);
i_ptid=he5pt->ptid;
-@@ -1540,7 +1513,6 @@
+@@ -1540,7 +1513,6 @@ hdfeos5_ptsetfield(VALUE mod,VALUE fieldname)
struct HE5Pt *he5pt;
struct HE5PtField *he5point;
@@ -1380,7 +1387,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5pt);
i_ptid=he5pt->ptid;
-@@ -1554,7 +1526,7 @@
+@@ -1554,7 +1526,7 @@ hdfeos5_ptsetfield(VALUE mod,VALUE fieldname)
he5point = HE5PtField_init(i_fieldname, i_levelname, i_ptid, mod);
return(Data_Wrap_Struct(cHE5PtField, he5ptfield_mark_obj, HE5PtField_free, he5point));
@@ -1389,7 +1396,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
VALUE
hdfeos5_ptsetfield_level(VALUE mod,VALUE fieldname,VALUE levelname)
-@@ -1565,7 +1537,6 @@
+@@ -1565,7 +1537,6 @@ hdfeos5_ptsetfield_level(VALUE mod,VALUE fieldname,VALUE levelname)
struct HE5Pt *he5pt;
struct HE5PtField *he5point;
@@ -1397,7 +1404,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Pt, he5pt);
i_ptid=he5pt->ptid;
-@@ -1584,14 +1555,13 @@
+@@ -1584,14 +1555,13 @@ hdfeos5_ptgetfield(VALUE mod)
char *i_fieldname;
struct HE5PtField *he5point;
@@ -1413,7 +1420,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
hdfeos5_pt_whether_in_define_mode(VALUE pt)
{
int fid;
-@@ -1622,7 +1592,7 @@
+@@ -1622,7 +1592,7 @@ hdfeos5_pt_path(VALUE pt)
{
char *i_name;
struct HE5Pt *he5point;
@@ -1422,7 +1429,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(pt, struct HE5Pt, he5point);
i_name=he5point->name;
-@@ -1634,7 +1604,7 @@
+@@ -1634,7 +1604,7 @@ hdfeos5_pt_inqname(VALUE pt)
{
char *i_name;
struct HE5Pt *he5point;
@@ -1431,7 +1438,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(pt, struct HE5Pt, he5point);
i_name=he5point->name;
-@@ -1645,8 +1615,7 @@
+@@ -1645,8 +1615,7 @@ VALUE
hdfeos5_pt_file(VALUE pt)
{
struct HE5Pt *he5point;
@@ -1441,7 +1448,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(pt, struct HE5Pt, he5point);
return(he5point->file);
}
-@@ -1656,7 +1625,6 @@
+@@ -1656,7 +1625,6 @@ hdfeos5_level_point(VALUE field)
{
struct HE5PtField *he5point;
@@ -1449,7 +1456,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5PtField, he5point);
return(he5point->point);
}
-@@ -1667,7 +1635,6 @@
+@@ -1667,7 +1635,6 @@ hdfeos5_level_inqname(VALUE level)
char *i_name;
struct HE5PtField *he5point;
@@ -1457,7 +1464,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(level, struct HE5PtField, he5point);
i_name=he5point->name;
-@@ -1690,7 +1657,6 @@
+@@ -1690,7 +1657,6 @@ hdfeos5_ptwritelevel_char(VALUE mod, VALUE count, VALUE data)
unsigned char *i_data;
struct HE5PtField *he5point;
@@ -1465,7 +1472,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_fieldname=he5point->name;
i_levelname=he5point->levelname;
-@@ -1725,7 +1691,6 @@
+@@ -1725,7 +1691,6 @@ hdfeos5_ptwritelevel_int(VALUE mod, VALUE count, VALUE data)
int *i_data;
struct HE5PtField *he5point;
@@ -1473,7 +1480,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1760,7 +1725,6 @@
+@@ -1760,7 +1725,6 @@ hdfeos5_ptwritelevel_short(VALUE mod, VALUE count, VALUE data)
short *i_data;
struct HE5PtField *he5point;
@@ -1481,7 +1488,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1795,7 +1759,6 @@
+@@ -1795,7 +1759,6 @@ hdfeos5_ptwritelevel_long(VALUE mod, VALUE count, VALUE data)
long *i_data;
struct HE5PtField *he5point;
@@ -1489,7 +1496,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1830,7 +1793,6 @@
+@@ -1830,7 +1793,6 @@ hdfeos5_ptwritelevel_float(VALUE mod, VALUE count, VALUE data)
float *i_data;
struct HE5PtField *he5point;
@@ -1497,7 +1504,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1865,7 +1827,6 @@
+@@ -1865,7 +1827,6 @@ hdfeos5_ptwritelevel_double(VALUE mod, VALUE count, VALUE data)
double *i_data;
struct HE5PtField *he5point;
@@ -1505,7 +1512,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1907,7 +1868,6 @@
+@@ -1907,7 +1868,6 @@ hdfeos5_ptreadlevel_char(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1513,7 +1520,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -1917,7 +1877,7 @@
+@@ -1917,7 +1877,7 @@ hdfeos5_ptreadlevel_char(VALUE mod)
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1522,7 +1529,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -1938,13 +1898,13 @@
+@@ -1938,13 +1898,13 @@ hdfeos5_ptreadlevel_char(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1538,7 +1545,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2016,7 +1976,6 @@
+@@ -2016,7 +1976,6 @@ hdfeos5_ptreadlevel_short(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1546,7 +1553,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2026,7 +1985,7 @@
+@@ -2026,7 +1985,7 @@ hdfeos5_ptreadlevel_short(VALUE mod)
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1555,7 +1562,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -2047,13 +2006,13 @@
+@@ -2047,13 +2006,13 @@ hdfeos5_ptreadlevel_short(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1571,7 +1578,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2125,7 +2084,6 @@
+@@ -2125,7 +2084,6 @@ hdfeos5_ptreadlevel_int(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1579,7 +1586,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2135,7 +2093,7 @@
+@@ -2135,7 +2093,7 @@ hdfeos5_ptreadlevel_int(VALUE mod)
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1588,7 +1595,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -2156,13 +2114,13 @@
+@@ -2156,13 +2114,13 @@ hdfeos5_ptreadlevel_int(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1604,7 +1611,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2234,7 +2192,6 @@
+@@ -2234,7 +2192,6 @@ hdfeos5_ptreadlevel_long(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1612,7 +1619,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2244,7 +2201,7 @@
+@@ -2244,7 +2201,7 @@ hdfeos5_ptreadlevel_long(VALUE mod)
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1621,7 +1628,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -2265,13 +2222,13 @@
+@@ -2265,13 +2222,13 @@ hdfeos5_ptreadlevel_long(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1637,7 +1644,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2343,7 +2300,6 @@
+@@ -2343,7 +2300,6 @@ hdfeos5_ptreadlevel_float(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1645,7 +1652,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2352,7 +2308,7 @@
+@@ -2352,7 +2308,7 @@ hdfeos5_ptreadlevel_float(VALUE mod)
i_level=HE5_PTlevelindx(i_ptid, i_levelname);
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1654,7 +1661,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -2374,13 +2330,13 @@
+@@ -2374,13 +2330,13 @@ hdfeos5_ptreadlevel_float(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1670,7 +1677,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2452,7 +2408,6 @@
+@@ -2452,7 +2408,6 @@ hdfeos5_ptreadlevel_double(VALUE mod)
HE5_CmpDTSinfo dtsinfo;
struct HE5PtField *he5point;
@@ -1678,7 +1685,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2462,7 +2417,7 @@
+@@ -2462,7 +2417,7 @@ hdfeos5_ptreadlevel_double(VALUE mod)
i_nrecs=HE5_PTnrecs(i_ptid, i_level);
if(i_level <0) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1687,7 +1694,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(status == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
for(i=0;i<dtsinfo.nfields;i++) {
if(strcmp(i_fieldname,dtsinfo.fieldname[i])==0){
-@@ -2483,13 +2438,13 @@
+@@ -2483,13 +2438,13 @@ hdfeos5_ptreadlevel_double(VALUE mod)
status = HE5_PTfwdlinkinfo(i_ptid, i_level, o_linkfield);
if( status !=FAIL ) {
@@ -1703,7 +1710,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_nrecs=HE5_PTnrecs(i_ptid, i_level+1);
for(i=0;i<i_rank;i++){
shape[i_rank-1-i]=i_nrecs;
-@@ -2556,7 +2511,6 @@
+@@ -2556,7 +2511,6 @@ hdfeos5_ptupdatelevel_char(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
unsigned char *i_data;
struct HE5PtField *he5point;
@@ -1711,7 +1718,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2594,7 +2548,6 @@
+@@ -2594,7 +2548,6 @@ hdfeos5_ptupdatelevel_short(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
short *i_data;
struct HE5PtField *he5point;
@@ -1719,7 +1726,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2632,7 +2585,6 @@
+@@ -2632,7 +2585,6 @@ hdfeos5_ptupdatelevel_int(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
int *i_data;
struct HE5PtField *he5point;
@@ -1727,7 +1734,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2670,7 +2622,6 @@
+@@ -2670,7 +2622,6 @@ hdfeos5_ptupdatelevel_long(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
long *i_data;
struct HE5PtField *he5point;
@@ -1735,7 +1742,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2708,7 +2659,6 @@
+@@ -2708,7 +2659,6 @@ hdfeos5_ptupdatelevel_float(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
float *i_data;
struct HE5PtField *he5point;
@@ -1743,7 +1750,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2746,7 +2696,6 @@
+@@ -2746,7 +2696,6 @@ hdfeos5_ptupdatelevel_double(VALUE mod, VALUE nrec, VALUE recs, VALUE data)
double *i_data;
struct HE5PtField *he5point;
@@ -1751,7 +1758,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5PtField, he5point);
i_levelname=he5point->levelname;
i_fieldname=he5point->name;
-@@ -2824,7 +2773,7 @@
+@@ -2824,7 +2773,7 @@ init_hdfeos5pt_wrap(void)
rb_define_method(cHE5PtField, "put_vars_float", hdfeos5_ptwritelevel_float, 2);
rb_define_method(cHE5PtField, "put_vars_double", hdfeos5_ptwritelevel_double, 2);
rb_define_method(cHE5PtField, "put_vars_short", hdfeos5_ptwritelevel_short, 2);
@@ -1760,14 +1767,16 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
rb_define_method(cHE5PtField, "get_vars_char", hdfeos5_ptreadlevel_char, 0);
rb_define_method(cHE5PtField, "get_vars_int", hdfeos5_ptreadlevel_int, 0);
rb_define_method(cHE5PtField, "get_vars_long", hdfeos5_ptreadlevel_long, 0);
-@@ -2839,4 +2788,3 @@
+@@ -2839,4 +2788,3 @@ init_hdfeos5pt_wrap(void)
rb_define_method(cHE5PtField, "fwdlink", hdfeos5_ptfwdlinkinfo, 0);
rb_define_method(cHE5PtField, "bcklink", hdfeos5_ptbcklinkinfo, 0);
}
-
+diff --git a/hdfeos5sw_wrap.c b/hdfeos5sw_wrap.c
+index 46578f1..42764b0 100644
--- a/hdfeos5sw_wrap.c
+++ b/hdfeos5sw_wrap.c
-@@ -315,7 +315,6 @@
+@@ -315,7 +315,6 @@ hdfeos5_swcreate(VALUE mod, VALUE swathname)
char* file;
VALUE Swath;
@@ -1775,7 +1784,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
file=he5file->name;
-@@ -341,7 +340,6 @@
+@@ -341,7 +340,6 @@ hdfeos5_swattach(VALUE mod, VALUE swathname)
struct HE5Sw *he5swath;
VALUE Swath;
@@ -1783,7 +1792,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
i_fname=he5file->name;
-@@ -368,7 +366,6 @@
+@@ -368,7 +366,6 @@ hdfeos5_swdefdim(VALUE mod, VALUE dimname, VALUE dim)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1791,7 +1800,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
Check_Type(dimname,T_STRING);
-@@ -390,7 +387,6 @@
+@@ -390,7 +387,6 @@ hdfeos5_swdiminfo(VALUE mod, VALUE dimname)
VALUE ndim;
struct HE5Sw *he5swath;
@@ -1799,7 +1808,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -416,7 +412,6 @@
+@@ -416,7 +412,6 @@ hdfeos5_swmapinfo(VALUE mod, VALUE geodim, VALUE datadim)
VALUE increment;
struct HE5Sw *he5swath;
@@ -1807,7 +1816,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -451,7 +446,6 @@
+@@ -451,7 +446,6 @@ hdfeos5_swidxmapinfo(VALUE mod, VALUE geodim, VALUE datadim)
VALUE dimsize;
struct HE5Sw *he5swath;
@@ -1815,7 +1824,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -488,12 +482,11 @@
+@@ -488,12 +482,11 @@ hdfeos5_swcompinfo(VALUE mod)
VALUE compparm;
struct HE5SwField *he5field;
@@ -1829,7 +1838,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWcompinfo(i_swathid, i_fldname, &o_compcode, o_compparm);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
change_comptype(o_compcode,str);
-@@ -519,7 +512,6 @@
+@@ -519,7 +512,6 @@ hdfeos5_swfieldinfo(VALUE mod)
VALUE dimlist;
struct HE5SwField *he5field;
@@ -1837,7 +1846,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -547,7 +539,6 @@
+@@ -547,7 +539,6 @@ hdfeos5_swchunkinfo(VALUE mod, VALUE fldname)
VALUE chunk_dims;
struct HE5Sw *he5swath;
@@ -1845,7 +1854,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
Check_Type(fldname,T_STRING);
-@@ -578,7 +569,6 @@
+@@ -578,7 +569,6 @@ hdfeos5_swdefdimmap(VALUE mod, VALUE geodim, VALUE datadim, VALUE offset, VALUE
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1853,7 +1862,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -610,7 +600,6 @@
+@@ -610,7 +600,6 @@ hdfeos5_swdefidxmap(VALUE mod, VALUE geodim, VALUE datadim, VALUE index)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1861,7 +1870,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -642,7 +631,6 @@
+@@ -642,7 +631,6 @@ hdfeos5_swdefchunk(VALUE mod, VALUE rank, VALUE dim)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1869,7 +1878,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -669,7 +657,6 @@
+@@ -669,7 +657,6 @@ hdfeos5_swdefcomp(VALUE mod, VALUE compcode, VALUE compparm)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1877,7 +1886,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -699,7 +686,6 @@
+@@ -699,7 +686,6 @@ hdfeos5_swdefcomchunk(VALUE mod, VALUE compcode, VALUE compparm, VALUE rank, VAL
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1885,7 +1894,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -739,7 +725,6 @@
+@@ -739,7 +725,6 @@ hdfeos5_swdefgeofield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimli
struct HE5SwField *he5field;
struct HE5Sw *he5swath;
@@ -1893,7 +1902,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -781,7 +766,6 @@
+@@ -781,7 +766,6 @@ hdfeos5_swdefdatafield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdiml
struct HE5SwField *he5field;
struct HE5Sw *he5swath;
@@ -1901,7 +1910,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -820,7 +804,6 @@
+@@ -820,7 +804,6 @@ hdfeos5_swwritedatameta(VALUE mod, VALUE dimlist, VALUE mvalue)
VALUE rtn_val;
struct HE5SwField *he5field;
@@ -1909,7 +1918,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -849,7 +832,6 @@
+@@ -849,7 +832,6 @@ hdfeos5_swwritegeometa(VALUE mod, VALUE dimlist, VALUE mvalue)
VALUE rtn_val;
struct HE5SwField *he5field;
@@ -1917,7 +1926,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -879,7 +861,6 @@
+@@ -879,7 +861,6 @@ hdfeos5_swwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -1925,7 +1934,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -894,7 +875,7 @@
+@@ -894,7 +875,7 @@ hdfeos5_swwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -1934,7 +1943,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWwriteattr(i_swathid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -913,7 +894,6 @@
+@@ -913,7 +894,6 @@ hdfeos5_sw_get_att(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -1942,7 +1951,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -923,7 +903,7 @@
+@@ -923,7 +903,7 @@ hdfeos5_sw_get_att(VALUE mod, VALUE attrname)
o_rtn_val = HE5_SWattrinfo(i_swathid, i_attrname, &o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -1951,7 +1960,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWreadattr(i_swathid, i_attrname, o_datbuf);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
return result;
-@@ -941,7 +921,6 @@
+@@ -941,7 +921,6 @@ hdfeos5_swinqattrs(VALUE mod)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -1959,7 +1968,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -972,7 +951,6 @@
+@@ -972,7 +951,6 @@ hdfeos5_swinqdims(VALUE mod, VALUE entrycode)
VALUE dims;
struct HE5Sw *he5swath;
@@ -1967,7 +1976,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -981,7 +959,7 @@
+@@ -981,7 +959,7 @@ hdfeos5_swinqdims(VALUE mod, VALUE entrycode)
hs_dims = ALLOCA_N(unsigned long long, i_count);
o_dimnames = ALLOCA_N(char, (i_strbufsize + 1));
@@ -1976,7 +1985,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_ndims = HE5_SWinqdims(i_swathid, o_dimnames, hs_dims);
if(o_ndims < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
ndims = LONG2NUM(o_ndims);
-@@ -1007,7 +985,6 @@
+@@ -1007,7 +985,6 @@ hdfeos5_swinqmaps(VALUE mod, VALUE entrycode)
VALUE increment;
struct HE5Sw *he5swath;
@@ -1984,7 +1993,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1042,7 +1019,6 @@
+@@ -1042,7 +1019,6 @@ hdfeos5_swinqidxmaps(VALUE mod, VALUE entrycode)
VALUE idxsizes;
struct HE5Sw *he5swath;
@@ -1992,7 +2001,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1077,7 +1053,6 @@
+@@ -1077,7 +1053,6 @@ hdfeos5_swinqdatafields(VALUE mod, VALUE entrycode)
VALUE ntype;
struct HE5Sw *he5swath;
@@ -2000,7 +2009,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1090,12 +1065,12 @@
+@@ -1090,12 +1065,12 @@ hdfeos5_swinqdatafields(VALUE mod, VALUE entrycode)
o_nflds = HE5_SWinqdatafields(i_swathid, o_fieldlist, NULL, NULL);
if (o_nflds < 0 ) return Qfalse ;
@@ -2015,7 +2024,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_count = (int)o_nflds;
rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
-@@ -1119,7 +1094,6 @@
+@@ -1119,7 +1094,6 @@ hdfeos5_swinqgeofields(VALUE mod, VALUE entrycode)
VALUE ntype;
struct HE5Sw *he5swath;
@@ -2023,7 +2032,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1161,7 +1135,6 @@
+@@ -1161,7 +1135,6 @@ hdfeos5_swinqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
VALUE size;
struct HE5Sw *he5swath;
@@ -2031,7 +2040,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1197,7 +1170,6 @@
+@@ -1197,7 +1170,6 @@ hdfeos5_swnentries(VALUE mod, VALUE entrycode)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2039,7 +2048,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1225,7 +1197,6 @@
+@@ -1225,7 +1197,6 @@ hdfeos5_swinqswath(VALUE mod)
VALUE strbufsize;
struct HE5 *he5file;
@@ -2047,7 +2056,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1361,7 +1332,6 @@
+@@ -1361,7 +1332,6 @@ hdfeos5_swfldsrch(VALUE mod)
VALUE type_id;
struct HE5SwField *he5field;
@@ -2055,7 +2064,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_swathid=he5field->swid;
i_fieldname=he5field->name;
-@@ -1389,7 +1359,6 @@
+@@ -1389,7 +1359,6 @@ hdfeos5_swdetach(VALUE mod)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2063,7 +2072,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1409,7 +1378,6 @@
+@@ -1409,7 +1378,6 @@ hdfeos5_swdefboxregion(VALUE mod, VALUE cornerlon, VALUE cornerlat, VALUE mode)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2071,7 +2080,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1447,7 +1415,6 @@
+@@ -1447,7 +1415,6 @@ hdfeos5_swregionindex(VALUE mod, VALUE cornerlon, VALUE cornerlat, VALUE mode)
VALUE idxrange;
struct HE5Sw *he5swath;
@@ -2079,7 +2088,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1486,7 +1453,6 @@
+@@ -1486,7 +1453,6 @@ hdfeos5_swdeftimeperiod(VALUE mod, VALUE starttime, VALUE stoptime, VALUE mode)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2087,7 +2096,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1520,7 +1486,6 @@
+@@ -1520,7 +1486,6 @@ hdfeos5_swextractregion(VALUE mod, VALUE regionid, VALUE externalflag)
VALUE buffer;
struct HE5SwField *he5field;
@@ -2095,7 +2104,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -1553,7 +1518,6 @@
+@@ -1553,7 +1518,6 @@ hdfeos5_swextractperiod(VALUE mod, VALUE periodid, VALUE externalflag)
VALUE buffer;
struct HE5SwField *he5field;
@@ -2103,7 +2112,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -1597,7 +1561,6 @@
+@@ -1597,7 +1561,6 @@ hdfeos5_swdefvrtregion(VALUE mod, VALUE regionid, VALUE vertobj, VALUE range)
hid_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -2111,7 +2120,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1629,7 +1592,6 @@
+@@ -1629,7 +1592,6 @@ hdfeos5_swsetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2119,7 +2128,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1667,7 +1629,6 @@
+@@ -1667,7 +1629,6 @@ hdfeos5_swgetfillvalue(VALUE mod,VALUE fieldname)
VALUE fillval;
struct HE5Sw *he5swath;
@@ -2127,7 +2136,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1700,7 +1661,6 @@
+@@ -1700,7 +1661,6 @@ hdfeos5_swregioninfo(VALUE mod, VALUE regionid)
VALUE size;
struct HE5SwField *he5field;
@@ -2135,7 +2144,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -1737,7 +1697,6 @@
+@@ -1737,7 +1697,6 @@ hdfeos5_swperiodinfo(VALUE mod, VALUE periodid)
VALUE size;
struct HE5SwField *he5field;
@@ -2143,7 +2152,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -1765,7 +1724,6 @@
+@@ -1765,7 +1724,6 @@ hdfeos5_swupdatescene(VALUE mod, VALUE regionid)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2151,7 +2160,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1791,7 +1749,6 @@
+@@ -1791,7 +1749,6 @@ hdfeos5_swupdateidxmap(VALUE mod, VALUE regionid, VALUE indexin)
VALUE indicies;
struct HE5Sw *he5swath;
@@ -2159,7 +2168,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1821,7 +1778,6 @@
+@@ -1821,7 +1778,6 @@ hdfeos5_swgeomapinfo(VALUE mod, VALUE geodim)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2167,7 +2176,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1848,7 +1804,6 @@
+@@ -1848,7 +1804,6 @@ hdfeos5_swwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2175,7 +2184,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1863,7 +1818,7 @@
+@@ -1863,7 +1818,7 @@ hdfeos5_swwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -2184,7 +2193,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWwritegrpattr(i_swathid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1882,7 +1837,6 @@
+@@ -1882,7 +1837,6 @@ hdfeos5_sw_get_grpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -2192,7 +2201,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1910,7 +1864,6 @@
+@@ -1910,7 +1864,6 @@ hdfeos5_swinqgrpattrs(VALUE mod)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2200,7 +2209,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1938,7 +1891,6 @@
+@@ -1938,7 +1891,6 @@ hdfeos5_swwritegeogrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE cou
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2208,7 +2217,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -1974,7 +1926,6 @@
+@@ -1974,7 +1926,6 @@ hdfeos5_sw_get_geogrpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -2216,7 +2225,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2002,14 +1953,13 @@
+@@ -2002,14 +1953,13 @@ hdfeos5_swinqgeogrpattrs(VALUE mod)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2232,7 +2241,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_nattr = HE5_SWinqgeogrpattrs(i_swathid, o_attrnames, &o_strbufsize);
if(o_nattr < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
nattr = LONG2NUM(o_nattr);
-@@ -2032,7 +1982,6 @@
+@@ -2032,7 +1982,6 @@ hdfeos5_swwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5SwField *he5field;
@@ -2240,7 +2249,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -2048,7 +1997,7 @@
+@@ -2048,7 +1997,7 @@ hdfeos5_swwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -2249,7 +2258,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWwritelocattr(i_swathid, i_fieldname, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecintary((int*)i_count);
-@@ -2068,7 +2017,6 @@
+@@ -2068,7 +2017,6 @@ hdfeos5_swfield_get_att(VALUE mod,VALUE attrname)
unsigned long long o_count;
struct HE5SwField *he5field;
@@ -2257,7 +2266,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fieldname=he5field->name;
i_swathid=he5field->swid;
-@@ -2076,7 +2024,7 @@
+@@ -2076,7 +2024,7 @@ hdfeos5_swfield_get_att(VALUE mod,VALUE attrname)
SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
@@ -2266,7 +2275,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
&o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",
__FILE__,__LINE__);
-@@ -2101,14 +2049,13 @@
+@@ -2101,14 +2049,13 @@ hdfeos5_swinqlocattrs(VALUE mod)
VALUE strbufsize;
struct HE5SwField *he5field;
@@ -2282,7 +2291,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_attrnames = ALLOCA_N(char, (o_strbufsize + 1));
o_nattr = HE5_SWinqlocattrs(i_swathid, i_fieldname, o_attrnames, &o_strbufsize);
if(o_nattr < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -2130,7 +2077,6 @@
+@@ -2130,7 +2077,6 @@ hdfeos5_prdefine(VALUE mod, VALUE profilename, VALUE dimlist, VALUE maxdimlist,
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2290,7 +2299,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2168,7 +2114,6 @@
+@@ -2168,7 +2114,6 @@ hdfeos5_prwrite(VALUE mod, VALUE profilename, VALUE start, VALUE stride, VALUE e
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2298,7 +2307,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2210,7 +2155,6 @@
+@@ -2210,7 +2155,6 @@ hdfeos5_prread(VALUE mod, VALUE profilename, VALUE start, VALUE stride, VALUE ed
VALUE buffer;
struct HE5Sw *he5swath;
@@ -2306,7 +2315,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2245,7 +2189,6 @@
+@@ -2245,7 +2189,6 @@ hdfeos5_prreclaimspace(VALUE mod, VALUE profilename)
VALUE buffer;
struct HE5Sw *he5swath;
@@ -2314,7 +2323,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2274,7 +2217,6 @@
+@@ -2274,7 +2217,6 @@ hdfeos5_prinquire(VALUE mod)
VALUE classid;
struct HE5Sw *he5swath;
@@ -2322,7 +2331,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2284,7 +2226,7 @@
+@@ -2284,7 +2226,7 @@ hdfeos5_prinquire(VALUE mod)
profnames = rb_str_new2(o_profnames);
rank = INT2NUM(o_rank);
classid = (o_classid == FAIL) ? Qfalse : Qtrue;
@@ -2331,7 +2340,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
return rb_ary_new3(4, rtn_val, profnames, rank, classid);
}
-@@ -2306,7 +2248,6 @@
+@@ -2306,7 +2248,6 @@ hdfeos5_prinfo(VALUE mod, VALUE profilename)
VALUE dimlist;
struct HE5Sw *he5swath;
@@ -2339,7 +2348,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2336,7 +2277,6 @@
+@@ -2336,7 +2277,6 @@ hdfeos5_prwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2347,7 +2356,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2372,7 +2312,6 @@
+@@ -2372,7 +2312,6 @@ hdfeos5_pr_get_grpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -2355,7 +2364,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2400,7 +2339,6 @@
+@@ -2400,7 +2339,6 @@ hdfeos5_prinqgrpattrs(VALUE mod)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2363,7 +2372,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2426,7 +2364,6 @@
+@@ -2426,7 +2364,6 @@ hdfeos5_swsetalias(VALUE mod, VALUE fieldname)
VALUE aliaslist;
struct HE5Sw *he5swath;
@@ -2371,7 +2380,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2450,7 +2387,6 @@
+@@ -2450,7 +2387,6 @@ hdfeos5_swdropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2379,7 +2388,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2479,7 +2415,6 @@
+@@ -2479,7 +2415,6 @@ hdfeos5_swinqdfldalias(VALUE mod)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2387,7 +2396,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2504,7 +2439,6 @@
+@@ -2504,7 +2439,6 @@ hdfeos5_swaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE buffer;
struct HE5Sw *he5swath;
@@ -2395,7 +2404,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2536,7 +2470,6 @@
+@@ -2536,7 +2470,6 @@ hdfeos5_swgetaliaslist(VALUE mod, VALUE fldgroup)
VALUE strbufsize;
struct HE5Sw *he5swath;
@@ -2403,7 +2412,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2561,7 +2494,6 @@
+@@ -2561,7 +2494,6 @@ hdfeos5_swfldrename(VALUE mod, VALUE oldfieldname,VALUE newfieldname)
herr_t o_rtn_val;
struct HE5Sw *he5swath;
@@ -2411,7 +2420,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2589,7 +2521,6 @@
+@@ -2589,7 +2521,6 @@ hdfeos5_swmountexternal(VALUE mod, VALUE fldgroup, VALUE extfilename)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2419,7 +2428,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2616,7 +2547,6 @@
+@@ -2616,7 +2547,6 @@ hdfeos5_swunmount(VALUE mod, VALUE fldgroup, VALUE fileid)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2427,7 +2436,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2643,7 +2573,6 @@
+@@ -2643,7 +2573,6 @@ hdfeos5_swreadexternal(VALUE mod, VALUE fldgroup, VALUE fieldname)
VALUE buffer;
struct HE5Sw *he5swath;
@@ -2435,7 +2444,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2672,7 +2601,6 @@
+@@ -2672,7 +2601,6 @@ hdfeos5_swsetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
VALUE rtn_val;
struct HE5Sw *he5swath;
@@ -2443,7 +2452,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2712,7 +2640,6 @@
+@@ -2712,7 +2640,6 @@ hdfeos5_swgetextdata(VALUE mod, VALUE fieldname)
VALUE size;
struct HE5Sw *he5swath;
@@ -2451,7 +2460,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
-@@ -2723,7 +2650,7 @@
+@@ -2723,7 +2650,7 @@ hdfeos5_swgetextdata(VALUE mod, VALUE fieldname)
o_rtn_val = HE5_SWgetextdata(i_swathid, i_fieldname, o_namelength, o_filelist, o_offset, o_size);
rtn_val = INT2NUM(o_rtn_val);
@@ -2460,7 +2469,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val);
filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val);
offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
-@@ -2768,7 +2695,6 @@
+@@ -2768,7 +2695,6 @@ hdfeos5_swchkswath(VALUE mod)
long o_rtn_val;
struct HE5 *he5file;
@@ -2468,7 +2477,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -2787,14 +2713,13 @@
+@@ -2787,14 +2713,13 @@ hdfeos5_swchkswathname(VALUE mod)
VALUE rstr;
struct HE5 *he5file;
@@ -2484,7 +2493,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_SWinqswath(i_filename, o_swathlist, &o_strbufsize);
if( o_rtn_val <= 0) return Qfalse;
rstr = rb_str_new(o_swathlist, o_strbufsize);
-@@ -2809,14 +2734,13 @@
+@@ -2809,14 +2734,13 @@ hdfeos5_swsetfield(VALUE mod,VALUE fieldname)
struct HE5Sw *he5swath;
struct HE5SwField *he5field;
@@ -2500,7 +2509,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
he5field = HE5SwField_init(i_fieldname, i_swathid, mod);
return(Data_Wrap_Struct(cHE5SwField, he5swfield_mark_obj, HE5SwField_free, he5field));
}
-@@ -2827,14 +2751,13 @@
+@@ -2827,14 +2751,13 @@ hdfeos5_swgetfield(VALUE mod)
char *i_fieldname;
struct HE5SwField *he5field;
@@ -2516,7 +2525,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
hdfeos5_sw_whether_in_define_mode(VALUE sw)
{
int fid;
-@@ -2843,7 +2766,7 @@
+@@ -2843,7 +2766,7 @@ hdfeos5_sw_whether_in_define_mode(VALUE sw)
uintn access = 0;
int status;
struct HE5Sw *he5swath;
@@ -2525,7 +2534,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(sw, struct HE5Sw, he5swath);
fid=he5swath->fid;
-@@ -2877,7 +2800,7 @@
+@@ -2877,7 +2800,7 @@ hdfeos5_sw_inqname(VALUE sw)
{
char *i_name;
struct HE5Sw *he5swath;
@@ -2534,7 +2543,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(sw, struct HE5Sw, he5swath);
i_name=he5swath->name;
-@@ -2888,8 +2811,7 @@
+@@ -2888,8 +2811,7 @@ VALUE
hdfeos5_sw_file(VALUE sw)
{
struct HE5Sw *he5swath;
@@ -2544,7 +2553,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(sw, struct HE5Sw, he5swath);
return(he5swath->file);
}
-@@ -2899,7 +2821,6 @@
+@@ -2899,7 +2821,6 @@ hdfeos5_var_swath(VALUE field)
{
struct HE5SwField *he5field;
@@ -2552,7 +2561,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5SwField, he5field);
return(he5field->swath);
}
-@@ -2910,7 +2831,6 @@
+@@ -2910,7 +2831,6 @@ hdfeos5_var_inqname(VALUE field)
char *i_name;
struct HE5SwField *he5field;
@@ -2560,7 +2569,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5SwField, he5field);
i_name=he5field->name;
-@@ -2938,7 +2858,6 @@
+@@ -2938,7 +2858,6 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
unsigned char scalar,*i_data;
struct HE5SwField *he5field;
@@ -2568,7 +2577,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -2951,7 +2870,7 @@
+@@ -2951,7 +2870,7 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2577,7 +2586,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3004,7 +2923,7 @@
+@@ -3004,7 +2923,7 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
i_data = ALLOCA_N(unsigned char,(c_edge_all +1));
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2586,7 +2595,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3034,7 +2953,6 @@
+@@ -3034,7 +2953,6 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
short scalar,*i_data;
struct HE5SwField *he5field;
@@ -2594,7 +2603,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3047,7 +2965,7 @@
+@@ -3047,7 +2965,7 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2603,7 +2612,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3100,7 +3018,7 @@
+@@ -3100,7 +3018,7 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
i_data = ALLOCA_N(short,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2612,7 +2621,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3130,7 +3048,6 @@
+@@ -3130,7 +3048,6 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
int scalar,*i_data;
struct HE5SwField *he5field;
@@ -2620,7 +2629,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3143,7 +3060,7 @@
+@@ -3143,7 +3060,7 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2629,7 +2638,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3196,7 +3113,7 @@
+@@ -3196,7 +3113,7 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
i_data = ALLOCA_N(int,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2638,7 +2647,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3226,7 +3143,6 @@
+@@ -3226,7 +3143,6 @@ hdfeos5_swwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
long scalar,*i_data;
struct HE5SwField *he5field;
@@ -2646,7 +2655,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3292,7 +3208,7 @@
+@@ -3292,7 +3208,7 @@ hdfeos5_swwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
i_data = ALLOCA_N(long,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2655,7 +2664,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3322,7 +3238,6 @@
+@@ -3322,7 +3238,6 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
float scalar,*i_data;
struct HE5SwField *he5field;
@@ -2663,7 +2672,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3335,7 +3250,7 @@
+@@ -3335,7 +3250,7 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2672,7 +2681,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3388,7 +3303,7 @@
+@@ -3388,7 +3303,7 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
i_data = ALLOCA_N(float,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2681,7 +2690,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3418,7 +3333,6 @@
+@@ -3418,7 +3333,6 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
double scalar,*i_data;
struct HE5SwField *he5field;
@@ -2689,7 +2698,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3431,7 +3345,7 @@
+@@ -3431,7 +3345,7 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2698,7 +2707,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3484,7 +3398,7 @@
+@@ -3484,7 +3398,7 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
i_data = ALLOCA_N(double,c_edge_all);
for(i=0;i<c_edge_all;i++){i_data[i]=scalar;}
} else if(len != c_edge_all) {
@@ -2707,7 +2716,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -3513,7 +3427,6 @@
+@@ -3513,7 +3427,6 @@ hdfeos5_swreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2715,7 +2724,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3527,7 +3440,7 @@
+@@ -3527,7 +3440,7 @@ hdfeos5_swreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2724,7 +2733,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3627,7 +3540,6 @@
+@@ -3627,7 +3540,6 @@ hdfeos5_swreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2732,7 +2741,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3641,7 +3553,7 @@
+@@ -3641,7 +3553,7 @@ hdfeos5_swreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2741,7 +2750,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3741,7 +3653,6 @@
+@@ -3741,7 +3653,6 @@ hdfeos5_swreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2749,7 +2758,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3755,7 +3666,7 @@
+@@ -3755,7 +3666,7 @@ hdfeos5_swreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2758,7 +2767,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3855,7 +3766,6 @@
+@@ -3855,7 +3766,6 @@ hdfeos5_swreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2766,7 +2775,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3869,7 +3779,7 @@
+@@ -3869,7 +3779,7 @@ hdfeos5_swreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2775,7 +2784,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -3969,7 +3879,6 @@
+@@ -3969,7 +3879,6 @@ hdfeos5_swreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2783,7 +2792,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -3983,7 +3892,7 @@
+@@ -3983,7 +3892,7 @@ hdfeos5_swreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2792,7 +2801,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -4083,7 +3992,6 @@
+@@ -4083,7 +3992,6 @@ hdfeos5_swreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
VALUE NArray;
struct HE5SwField *he5field;
@@ -2800,7 +2809,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5SwField, he5field);
i_fldname=he5field->name;
i_swathid=he5field->swid;
-@@ -4097,7 +4005,7 @@
+@@ -4097,7 +4005,7 @@ hdfeos5_swreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -2809,7 +2818,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -4283,7 +4191,7 @@
+@@ -4283,7 +4191,7 @@ init_hdfeos5sw_wrap(void)
rb_define_method(cHE5SwField, "put_vars_float", hdfeos5_swwritefield_float, 4);
rb_define_method(cHE5SwField, "put_vars_double", hdfeos5_swwritefield_double, 4);
rb_define_method(cHE5SwField, "put_vars_short", hdfeos5_swwritefield_short, 4);
@@ -2818,14 +2827,16 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
rb_define_method(cHE5SwField, "get_vars_char", hdfeos5_swreadfield_char, 3);
rb_define_method(cHE5SwField, "get_vars_int", hdfeos5_swreadfield_int, 3);
rb_define_method(cHE5SwField, "get_vars_long", hdfeos5_swreadfield_long, 3);
-@@ -4297,4 +4205,3 @@
+@@ -4297,4 +4205,3 @@ init_hdfeos5sw_wrap(void)
rb_define_method(cHE5SwField, "setfield", hdfeos5_swsetfield, 1);
rb_define_method(cHE5SwField, "getfield", hdfeos5_swgetfield, 0);
}
-
+diff --git a/hdfeos5za_wrap.c b/hdfeos5za_wrap.c
+index 323e659..98ba52c 100644
--- a/hdfeos5za_wrap.c
+++ b/hdfeos5za_wrap.c
-@@ -313,7 +313,6 @@
+@@ -313,7 +313,6 @@ hdfeos5_zacreate(VALUE mod, VALUE zaname)
char* file;
VALUE ZA;
@@ -2833,7 +2844,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
file=he5file->name;
-@@ -339,7 +338,6 @@
+@@ -339,7 +338,6 @@ hdfeos5_zaattach(VALUE mod, VALUE zaname)
struct HE5Za *he5za;
VALUE ZA;
@@ -2841,7 +2852,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_fid=he5file->fid;
i_fname=he5file->name;
-@@ -366,7 +364,6 @@
+@@ -366,7 +364,6 @@ hdfeos5_zadefdim(VALUE mod, VALUE dimname, VALUE dim)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -2849,7 +2860,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
Check_Type(dimname,T_STRING);
-@@ -388,7 +385,6 @@
+@@ -388,7 +385,6 @@ hdfeos5_zadiminfo(VALUE mod, VALUE dimname)
VALUE ndim;
struct HE5Za *he5za;
@@ -2857,7 +2868,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -416,12 +412,11 @@
+@@ -416,12 +412,11 @@ hdfeos5_zacompinfo(VALUE mod)
VALUE rtn_val;
struct HE5ZaField *he5field;
@@ -2871,7 +2882,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_ZAcompinfo(i_zaid, i_fldname, &o_compcode, o_compparm);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
change_comptype(o_compcode,str);
-@@ -446,7 +441,6 @@
+@@ -446,7 +441,6 @@ hdfeos5_zainfo(VALUE mod)
VALUE dimlist;
struct HE5ZaField *he5field;
@@ -2879,7 +2890,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -472,7 +466,6 @@
+@@ -472,7 +466,6 @@ hdfeos5_zadefchunk(VALUE mod, VALUE rank, VALUE dim)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -2887,7 +2898,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -499,7 +492,6 @@
+@@ -499,7 +492,6 @@ hdfeos5_zadefcomp(VALUE mod, VALUE compcode, VALUE compparm)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -2895,7 +2906,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -529,7 +521,6 @@
+@@ -529,7 +521,6 @@ hdfeos5_zadefcomchunk(VALUE mod, VALUE compcode, VALUE compparm, VALUE rank, VAL
VALUE rtn_val;
struct HE5Za *he5za;
@@ -2903,7 +2914,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -568,7 +559,6 @@
+@@ -568,7 +559,6 @@ hdfeos5_zadefine(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimlist, V
struct HE5ZaField *he5field;
struct HE5Za *he5za;
@@ -2911,7 +2922,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(file, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -605,7 +595,6 @@
+@@ -605,7 +595,6 @@ hdfeos5_zawritedatameta(VALUE mod, VALUE dimlist, VALUE mvalue)
VALUE rtn_val;
struct HE5ZaField *he5field;
@@ -2919,7 +2930,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fieldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -636,7 +625,6 @@
+@@ -636,7 +625,6 @@ hdfeos5_zawriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
VALUE rtn_val;
struct HE5Za *he5za;
@@ -2927,7 +2938,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -651,7 +639,7 @@
+@@ -651,7 +639,7 @@ hdfeos5_zawriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -2936,7 +2947,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_ZAwriteattr(i_zaid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -670,7 +658,6 @@
+@@ -670,7 +658,6 @@ hdfeos5_za_get_att(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Za *he5za;
@@ -2944,7 +2955,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -680,7 +667,7 @@
+@@ -680,7 +667,7 @@ hdfeos5_za_get_att(VALUE mod, VALUE attrname)
o_rtn_val = HE5_ZAattrinfo(i_zaid, i_attrname, &o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
@@ -2953,7 +2964,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_ZAreadattr(i_zaid, i_attrname, o_datbuf);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
return result;
-@@ -698,7 +685,6 @@
+@@ -698,7 +685,6 @@ hdfeos5_zainqattrs(VALUE mod)
VALUE strbufsize;
struct HE5Za *he5za;
@@ -2961,7 +2972,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -729,7 +715,6 @@
+@@ -729,7 +715,6 @@ hdfeos5_zainqdims(VALUE mod, VALUE entrycode)
VALUE dims;
struct HE5Za *he5za;
@@ -2969,7 +2980,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -738,7 +723,7 @@
+@@ -738,7 +723,7 @@ hdfeos5_zainqdims(VALUE mod, VALUE entrycode)
hs_dims = ALLOCA_N(unsigned long long, i_count);
o_dimnames = ALLOCA_N(char, (i_strbufsize + 1));
@@ -2978,7 +2989,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_ndims = HE5_ZAinqdims(i_zaid, o_dimnames, hs_dims);
if(o_ndims < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
ndims = LONG2NUM(o_ndims);
-@@ -764,7 +749,6 @@
+@@ -764,7 +749,6 @@ hdfeos5_zainquire(VALUE mod, VALUE entrycode)
VALUE ntype;
struct HE5Za *he5za;
@@ -2986,7 +2997,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -777,12 +761,12 @@
+@@ -777,12 +761,12 @@ hdfeos5_zainquire(VALUE mod, VALUE entrycode)
o_nflds = HE5_ZAinquire(i_zaid, o_fieldlist, NULL, NULL);
if (o_nflds < 0 ) return Qfalse ;
@@ -3001,7 +3012,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
i_count = (int)o_nflds;
rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count);
ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count);
-@@ -807,7 +791,6 @@
+@@ -807,7 +791,6 @@ hdfeos5_zainqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
VALUE size;
struct HE5Za *he5za;
@@ -3009,7 +3020,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -844,7 +827,6 @@
+@@ -844,7 +827,6 @@ hdfeos5_zachunkinfo(VALUE mod, VALUE fldname)
VALUE chunk_dims;
struct HE5Za *he5za;
@@ -3017,7 +3028,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
Check_Type(fldname,T_STRING);
-@@ -874,7 +856,6 @@
+@@ -874,7 +856,6 @@ hdfeos5_zanentries(VALUE mod, VALUE entrycode)
VALUE strbufsize;
struct HE5Za *he5za;
@@ -3025,7 +3036,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -902,7 +883,6 @@
+@@ -902,7 +883,6 @@ hdfeos5_zainqza(VALUE mod)
VALUE strbufsize;
struct HE5 *he5file;
@@ -3033,7 +3044,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1038,7 +1018,6 @@
+@@ -1038,7 +1018,6 @@ hdfeos5_zafldsrch(VALUE mod)
VALUE type_id;
struct HE5ZaField *he5field;
@@ -3041,7 +3052,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_zaid=he5field->zaid;
i_fieldname=he5field->name;
-@@ -1066,7 +1045,6 @@
+@@ -1066,7 +1045,6 @@ hdfeos5_zadetach(VALUE mod)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3049,7 +3060,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1086,7 +1064,6 @@
+@@ -1086,7 +1064,6 @@ hdfeos5_zasetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3057,7 +3068,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1124,7 +1101,6 @@
+@@ -1124,7 +1101,6 @@ hdfeos5_zagetfillvalue(VALUE mod,VALUE fieldname)
VALUE fillval;
struct HE5Za *he5za;
@@ -3065,7 +3076,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1153,7 +1129,6 @@
+@@ -1153,7 +1129,6 @@ hdfeos5_zawritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3073,7 +3084,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1168,7 +1143,7 @@
+@@ -1168,7 +1143,7 @@ hdfeos5_zawritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_numbertypechk = check_numbertype(RSTRING_PTR(numbertype));
i_count = hdfeos5_obj2cunsint64ary(count);
@@ -3082,7 +3093,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_ZAwritegrpattr(i_zaid, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecunsint64ary(i_count);
-@@ -1187,7 +1162,6 @@
+@@ -1187,7 +1162,6 @@ hdfeos5_za_get_grpatt(VALUE mod, VALUE attrname)
herr_t o_rtn_val;
struct HE5Za *he5za;
@@ -3090,7 +3101,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1215,7 +1189,6 @@
+@@ -1215,7 +1189,6 @@ hdfeos5_zainqgrpattrs(VALUE mod)
VALUE strbufsize;
struct HE5Za *he5za;
@@ -3098,7 +3109,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1245,7 +1218,6 @@
+@@ -1245,7 +1218,6 @@ hdfeos5_zawritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
VALUE rtn_val;
struct HE5ZaField *he5field;
@@ -3106,7 +3117,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fieldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -1262,7 +1234,7 @@
+@@ -1262,7 +1234,7 @@ hdfeos5_zawritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_count = hdfeos5_obj2cunsint64ary(count);
i_datbuf = hdfeos5_obj2cfloatary(datbuf);
@@ -3115,7 +3126,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_rtn_val = HE5_ZAwritelocattr(i_zaid, i_fieldname, i_attrname, i_numbertype, i_count, i_datbuf);
rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue;
hdfeos5_freecintary((int*)i_count);
-@@ -1282,7 +1254,6 @@
+@@ -1282,7 +1254,6 @@ hdfeos5_zafield_get_att(VALUE mod,VALUE attrname)
unsigned long long o_count;
struct HE5ZaField *he5field;
@@ -3123,7 +3134,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fieldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -1290,7 +1261,7 @@
+@@ -1290,7 +1261,7 @@ hdfeos5_zafield_get_att(VALUE mod,VALUE attrname)
SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
@@ -3132,7 +3143,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
&o_ntype, &o_count);
if(o_rtn_val == FAIL) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",
__FILE__,__LINE__);
-@@ -1315,14 +1286,13 @@
+@@ -1315,14 +1286,13 @@ hdfeos5_zainqlocattrs(VALUE mod)
VALUE strbufsize;
struct HE5ZaField *he5field;
@@ -3148,7 +3159,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
o_attrnames = ALLOCA_N(char, (o_strbufsize + 1));
o_nattr = HE5_ZAinqlocattrs(i_zaid, i_fieldname, o_attrnames, &o_strbufsize);
if(o_nattr < 0 ) rb_raise(rb_eHE5Error, "ERROR [%s:%d]",__FILE__,__LINE__);
-@@ -1342,7 +1312,6 @@
+@@ -1342,7 +1312,6 @@ hdfeos5_zasetalias(VALUE mod, VALUE fieldname)
VALUE aliaslist;
struct HE5Za *he5za;
@@ -3156,7 +3167,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1366,7 +1335,6 @@
+@@ -1366,7 +1335,6 @@ hdfeos5_zadropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3164,7 +3175,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1395,7 +1363,6 @@
+@@ -1395,7 +1363,6 @@ hdfeos5_zainqfldalias(VALUE mod)
VALUE strbufsize;
struct HE5Za *he5za;
@@ -3172,7 +3183,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1421,7 +1388,6 @@
+@@ -1421,7 +1388,6 @@ hdfeos5_zaaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
VALUE buffer;
struct HE5Za *he5za;
@@ -3180,7 +3191,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1454,7 +1420,6 @@
+@@ -1454,7 +1420,6 @@ hdfeos5_zagetaliaslist(VALUE mod, VALUE fldgroup)
VALUE strbufsize;
struct HE5Za *he5za;
@@ -3188,7 +3199,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1479,7 +1444,6 @@
+@@ -1479,7 +1444,6 @@ hdfeos5_zafldrename(VALUE mod, VALUE oldfieldname,VALUE newfieldname)
herr_t o_rtn_val;
struct HE5Za *he5za;
@@ -3196,7 +3207,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1507,7 +1471,6 @@
+@@ -1507,7 +1471,6 @@ hdfeos5_zamountexternal(VALUE mod, VALUE fldgroup, VALUE extfilename)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3204,7 +3215,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1534,7 +1497,6 @@
+@@ -1534,7 +1497,6 @@ hdfeos5_zaunmount(VALUE mod, VALUE fldgroup, VALUE fileid)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3212,7 +3223,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1561,7 +1523,6 @@
+@@ -1561,7 +1523,6 @@ hdfeos5_zareadexternal(VALUE mod, VALUE fldgroup, VALUE fieldname)
VALUE buffer;
struct HE5Za *he5za;
@@ -3220,7 +3231,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1590,7 +1551,6 @@
+@@ -1590,7 +1551,6 @@ hdfeos5_zasetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
VALUE rtn_val;
struct HE5Za *he5za;
@@ -3228,7 +3239,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1630,7 +1590,6 @@
+@@ -1630,7 +1590,6 @@ hdfeos5_zagetextdata(VALUE mod, VALUE fieldname)
VALUE size;
struct HE5Za *he5za;
@@ -3236,7 +3247,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
-@@ -1641,7 +1600,7 @@
+@@ -1641,7 +1600,7 @@ hdfeos5_zagetextdata(VALUE mod, VALUE fieldname)
o_rtn_val = HE5_ZAgetextdata(i_zaid, i_fieldname, o_namelength, o_filelist, o_offset, o_size);
rtn_val = INT2NUM(o_rtn_val);
@@ -3245,7 +3256,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val);
filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val);
offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val);
-@@ -1658,7 +1617,6 @@
+@@ -1658,7 +1617,6 @@ hdfeos5_zachkza(VALUE mod)
long o_rtn_val;
struct HE5 *he5file;
@@ -3253,7 +3264,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1677,7 +1635,6 @@
+@@ -1677,7 +1635,6 @@ hdfeos5_zachkzaname(VALUE mod)
VALUE rstr;
struct HE5 *he5file;
@@ -3261,7 +3272,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5, he5file);
i_filename=he5file->name;
-@@ -1699,14 +1656,13 @@
+@@ -1699,14 +1656,13 @@ hdfeos5_zasetfield(VALUE mod,VALUE fieldname)
struct HE5Za *he5za;
struct HE5ZaField *he5field;
@@ -3277,7 +3288,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
he5field = HE5ZaField_init(i_fieldname, i_zaid, mod);
return(Data_Wrap_Struct(cHE5ZaField, he5zafield_mark_obj, HE5ZaField_free, he5field));
}
-@@ -1717,14 +1673,13 @@
+@@ -1717,14 +1673,13 @@ hdfeos5_zagetfield(VALUE mod)
char *i_fieldname;
struct HE5ZaField *he5field;
@@ -3293,7 +3304,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
hdfeos5_za_whether_in_define_mode(VALUE za)
{
int fid;
-@@ -1733,7 +1688,7 @@
+@@ -1733,7 +1688,7 @@ hdfeos5_za_whether_in_define_mode(VALUE za)
uintn access = 0;
int status;
struct HE5Za *he5za;
@@ -3302,7 +3313,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(za, struct HE5Za, he5za);
fid=he5za->fid;
-@@ -1755,7 +1710,7 @@
+@@ -1755,7 +1710,7 @@ hdfeos5_za_path(VALUE za)
{
char *i_name;
struct HE5Za *he5za;
@@ -3311,7 +3322,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(za, struct HE5Za, he5za);
i_name=he5za->name;
-@@ -1767,7 +1722,7 @@
+@@ -1767,7 +1722,7 @@ hdfeos5_za_inqname(VALUE za)
{
char *i_name;
struct HE5Za *he5za;
@@ -3320,7 +3331,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(za, struct HE5Za, he5za);
i_name=he5za->name;
-@@ -1778,8 +1733,7 @@
+@@ -1778,8 +1733,7 @@ VALUE
hdfeos5_za_file(VALUE za)
{
struct HE5Za *he5za;
@@ -3330,7 +3341,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(za, struct HE5Za, he5za);
return(he5za->file);
}
-@@ -1789,7 +1743,6 @@
+@@ -1789,7 +1743,6 @@ hdfeos5_zafld_za(VALUE field)
{
struct HE5ZaField *he5field;
@@ -3338,7 +3349,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5ZaField, he5field);
return(he5field->za);
}
-@@ -1800,7 +1753,6 @@
+@@ -1800,7 +1753,6 @@ hdfeos5_zafld_inqname(VALUE field)
char *i_name;
struct HE5ZaField *he5field;
@@ -3346,7 +3357,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(field, struct HE5ZaField, he5field);
i_name=he5field->name;
-@@ -1828,7 +1780,6 @@
+@@ -1828,7 +1780,6 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
unsigned char scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3354,7 +3365,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -1841,7 +1792,7 @@
+@@ -1841,7 +1792,7 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -3363,7 +3374,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -1894,7 +1845,7 @@
+@@ -1894,7 +1845,7 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
i_data = ALLOCA_N(unsigned char,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3372,7 +3383,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -1924,7 +1875,6 @@
+@@ -1924,7 +1875,6 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
short scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3380,7 +3391,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -1937,7 +1887,7 @@
+@@ -1937,7 +1887,7 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -3389,7 +3400,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -1990,7 +1940,7 @@
+@@ -1990,7 +1940,7 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
i_data = ALLOCA_N(short,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3398,7 +3409,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2020,7 +1970,6 @@
+@@ -2020,7 +1970,6 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
int scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3406,7 +3417,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2033,7 +1982,7 @@
+@@ -2033,7 +1982,7 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -3415,7 +3426,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2086,7 +2035,7 @@
+@@ -2086,7 +2035,7 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
i_data = ALLOCA_N(int,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3424,7 +3435,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2116,7 +2065,6 @@
+@@ -2116,7 +2065,6 @@ hdfeos5_zawrite_long(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
long scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3432,7 +3443,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2182,7 +2130,7 @@
+@@ -2182,7 +2130,7 @@ hdfeos5_zawrite_long(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
i_data = ALLOCA_N(long,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3441,7 +3452,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2212,7 +2160,6 @@
+@@ -2212,7 +2160,6 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
float scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3449,7 +3460,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2225,7 +2172,7 @@
+@@ -2225,7 +2172,7 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -3458,7 +3469,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2278,7 +2225,7 @@
+@@ -2278,7 +2225,7 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
i_data = ALLOCA_N(float,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3467,7 +3478,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2308,7 +2255,6 @@
+@@ -2308,7 +2255,6 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
double scalar,*i_data;
struct HE5ZaField *he5field;
@@ -3475,7 +3486,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2321,7 +2267,7 @@
+@@ -2321,7 +2267,7 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
@@ -3484,7 +3495,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
if(l_start < 0) {
l_start += hs_dims[i];
}
-@@ -2374,7 +2320,7 @@
+@@ -2374,7 +2320,7 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
i_data = ALLOCA_N(double,c_count_all);
for(i=0;i<c_count_all;i++){i_data[i]=scalar;}
} else if(len != c_count_all) {
@@ -3493,7 +3504,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
}
}
-@@ -2403,7 +2349,6 @@
+@@ -2403,7 +2349,6 @@ hdfeos5_zaread_char(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3501,7 +3512,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2517,7 +2462,6 @@
+@@ -2517,7 +2462,6 @@ hdfeos5_zaread_short(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3509,7 +3520,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2631,7 +2575,6 @@
+@@ -2631,7 +2575,6 @@ hdfeos5_zaread_int(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3517,7 +3528,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2745,7 +2688,6 @@
+@@ -2745,7 +2688,6 @@ hdfeos5_zaread_long(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3525,7 +3536,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2859,7 +2801,6 @@
+@@ -2859,7 +2801,6 @@ hdfeos5_zaread_float(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3533,7 +3544,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -2973,7 +2914,6 @@
+@@ -2973,7 +2914,6 @@ hdfeos5_zaread_double(VALUE mod, VALUE start, VALUE stride, VALUE count)
VALUE NArray;
struct HE5ZaField *he5field;
@@ -3541,7 +3552,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
Data_Get_Struct(mod, struct HE5ZaField, he5field);
i_fldname=he5field->name;
i_zaid=he5field->zaid;
-@@ -3143,7 +3083,7 @@
+@@ -3143,7 +3083,7 @@ init_hdfeos5za_wrap(void)
rb_define_method(cHE5ZaField, "put_vars_float", hdfeos5_zawrite_float, 4);
rb_define_method(cHE5ZaField, "put_vars_double", hdfeos5_zawrite_double, 4);
rb_define_method(cHE5ZaField, "put_vars_short", hdfeos5_zawrite_short, 4);
=====================================
debian/patches/0008-Change-Encoding-Shift_JIS-to-UTF-8.patch
=====================================
@@ -0,0 +1,322 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 2 Nov 2021 15:41:14 +0900
+Subject: Change Encoding: Shift_JIS to UTF-8
+Forwarded: yes
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ lib/hdfeos5.rb | 91 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 46 insertions(+), 45 deletions(-)
+
+diff --git a/lib/hdfeos5.rb b/lib/hdfeos5.rb
+index 914c943..152e640 100644
+--- a/lib/hdfeos5.rb
++++ b/lib/hdfeos5.rb
+@@ -1,8 +1,9 @@
++# coding: utf-8
+ require 'narray'
+ require 'narray_miss'
+ require 'numru/hdfeos5raw'
+ #
+-# HE5 クラスに関して
++# HE5 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ module NumRu
+ class HE5
+@@ -27,11 +28,11 @@ module NumRu
+ end
+ he5_open(filename,mode)
+ end
+-
++
+ class << HE5
+ alias new open
+ end
+-
++
+ def HE5.create(filename)
+ open(filename,"w")
+ end
+@@ -142,7 +143,7 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5Swath クラスに関して
++# HE5Swath 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5Sw
+
+@@ -192,12 +193,12 @@ module NumRu
+ count, strbufsize = nentries('HE5_HDFE_NENTIMAP')
+ return count
+ end
+-# count Geo Location Field
++# count Geo Location Field
+ def ngeos
+ count, strbufsize = nentries('HE5_HDFE_NENTGFLD')
+ return count
+ end
+-# count Data Field
++# count Data Field
+ def nvars
+ count, strbufsize = nentries('HE5_HDFE_NENTDFLD')
+ return count
+@@ -312,13 +313,13 @@ module NumRu
+ case typecode
+ when 1
+ ctype = "short"
+- when 2
++ when 2
+ ctype = "sint"
+- when 3
++ when 3
+ ctype = "int"
+- when 4
++ when 4
+ ctype = "sfloat"
+- when 5
++ when 5
+ ctype = "float"
+ else
+ raise TypeError, "not match"
+@@ -332,10 +333,10 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5SwField クラスに関して
++# HE5SwField 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5SwField
+-
++
+ MissValAtts = ["MissingValue","_FillValue"]
+
+ class << HE5SwField
+@@ -686,7 +687,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise TypeError, "Hash argument must be {a_Range, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
+@@ -755,7 +756,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise ArgumentError, "Hash argument must be {first..last, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
+@@ -809,7 +810,7 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5Grid クラスに関して
++# HE5Grid 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5Gd
+
+@@ -849,7 +850,7 @@ module NumRu
+ count, strbufsize = nentries('HE5_HDFE_NENTDIM')
+ return count
+ end
+-# count Data Field
++# count Data Field
+ def nvars
+ count, strbufsize = nentries('HE5_HDFE_NENTDFLD')
+ return count
+@@ -871,7 +872,7 @@ module NumRu
+ if names == nil
+ vars = (0..nvars()-1).collect{|varid| get_var(varid)}
+ else
+- raise TypeError, "names is not an array" if ! names.is_a?(Array)
++ raise TypeError, "names is not an array" if ! names.is_a?(Array)
+ vars = names.collect{|name| var(name)}
+ raise ArgumentError, "One or more variables do not exist" if vars.include?(nil)
+ end
+@@ -920,13 +921,13 @@ module NumRu
+ case typecode
+ when 1
+ ctype = "short"
+- when 2
++ when 2
+ ctype = "sint"
+- when 3
++ when 3
+ ctype = "int"
+- when 4
++ when 4
+ ctype = "sfloat"
+- when 5
++ when 5
+ ctype = "float"
+ else
+ raise TypeError, "not match"
+@@ -940,10 +941,10 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5GdField クラスに関して
++# HE5GdField 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5GdField
+-
++
+ MissValAtts = ["MissingValue","_FillValue"]
+
+ class << HE5GdField
+@@ -1286,7 +1287,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise TypeError, "Hash argument must be {a_Range, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
+@@ -1355,7 +1356,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise ArgumentError, "Hash argument must be {first..last, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
+@@ -1408,7 +1409,7 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5Pt クラスに関して
++# HE5Pt 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5Pt
+
+@@ -1425,7 +1426,7 @@ module NumRu
+
+ def open(file, pname)
+ if(file.is_a?(String))
+- file = HE5.open(file, "a") # "r" の場合、simple plot でエラーになるため
++ file = HE5.open(file, "a") # "r" 縺ｮ蝣ｴ蜷医《imple plot 縺ｧ繧ｨ繝ｩ繝ｼ縺ｫ縺ｪ繧九◆繧
+ elsif(!file.is_a?(HE5))
+ raise TypeError,
+ "1st arg must be a HDF-EOS5 (file object) or a String (path)"
+@@ -1521,13 +1522,13 @@ module NumRu
+ case typecode
+ when 1
+ ctype = "short"
+- when 2
++ when 2
+ ctype = "sint"
+- when 3
++ when 3
+ ctype = "int"
+- when 4
++ when 4
+ ctype = "sfloat"
+- when 5
++ when 5
+ ctype = "float"
+ else
+ raise TypeError, "not match"
+@@ -1541,10 +1542,10 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5PtField クラスに関して
++# HE5PtField 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5PtField
+-
++
+ MissValAtts = ["MissingValue","_FillValue"]
+
+ class << HE5PtField
+@@ -1766,7 +1767,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise TypeError, "Hash argument must be {a_Range, step}"
+ end
+- count.push(r.first)
++ count.push(r.first)
+ set_count = true
+ elsif(i.is_a?(TrueClass))
+ count.push(0)
+@@ -1825,7 +1826,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise ArgumentError, "Hash argument must be {first..last, step}"
+ end
+- count.push(r.first)
++ count.push(r.first)
+ set_stride = true
+ elsif(i.is_a?(TrueClass))
+ count.push(0)
+@@ -1875,7 +1876,7 @@ module NumRu
+
+ ###############################
+ #
+-# HE5Za クラスに関して
++# HE5Za 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5Za
+
+@@ -1915,7 +1916,7 @@ module NumRu
+ count, strbufsize = nentries('HE5_HDFE_NENTDIM')
+ return count
+ end
+-# count Data Field
++# count Data Field
+ def nvars
+ count, strbufsize = nentries('HE5_HDFE_NENTDFLD')
+ return count
+@@ -1986,13 +1987,13 @@ module NumRu
+ case typecode
+ when 1
+ ctype = "short"
+- when 2
++ when 2
+ ctype = "sint"
+- when 3
++ when 3
+ ctype = "int"
+- when 4
++ when 4
+ ctype = "sfloat"
+- when 5
++ when 5
+ ctype = "float"
+ else
+ raise TypeError, "not match"
+@@ -2006,10 +2007,10 @@ module NumRu
+ end
+ ###############################
+ #
+-# HE5ZaField クラスに関して
++# HE5ZaField 繧ｯ繝ｩ繧ｹ縺ｫ髢｢縺励※
+ #
+ class HE5ZaField
+-
++
+ MissValAtts = ["MissingValue","_FillValue"]
+
+ class << HE5ZaField
+@@ -2352,7 +2353,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise TypeError, "Hash argument must be {a_Range, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
+@@ -2421,7 +2422,7 @@ module NumRu
+ if ( !( r.is_a?(Range) ) || ! ( s.is_a?(Integer) ) )
+ raise ArgumentError, "Hash argument must be {first..last, step}"
+ end
+- first.push(r.first)
++ first.push(r.first)
+ last.push(r.exclude_end? ? r.last-1 : r.last)
+ stride.push(s)
+ set_stride = true
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
0005-length-typo.patch
0006-hid_t.patch
0007-Drop-obsolete-rb_secure-rb_safe_level.patch
+0008-Change-Encoding-Shift_JIS-to-UTF-8.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/ruby-hdfeos5/-/compare/172d7e2d99821202b1648eed829c3c601815a76a...03606c6bf3028e000a9dd5cd7ae81c563de31ae7
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/ruby-hdfeos5/-/compare/172d7e2d99821202b1648eed829c3c601815a76a...03606c6bf3028e000a9dd5cd7ae81c563de31ae7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211102/aebb7204/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list