[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. f2185aed7b47ded42d34bb22a0b96f959843e923

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit f2185aed7b47ded42d34bb22a0b96f959843e923
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Dec 14 18:19:05 2010 +0900

    apply CVS update (minor bugfix)

diff --git a/debian/patches/cvshead20101214 b/debian/patches/cvshead20101214
new file mode 100644
index 0000000..a689cf4
--- /dev/null
+++ b/debian/patches/cvshead20101214
@@ -0,0 +1,99 @@
+From 894cc625824df55d83b679dc676acb7042fe237d Mon Sep 17 00:00:00 2001
+From: koshiro <koshiro>
+Date: Tue, 14 Dec 2010 06:23:00 +0000
+Subject: [PATCH] Tue Dec 14  2010  T Koshiro
+         * netcdfraw.c : nctype2natype : char* -> const char*
+         * test/aref_aset.rb, test/factor_offset.rb : bug fix.
+
+---
+ ChangeLog             |    4 ++++
+ netcdfraw.c           |   18 +++++++++---------
+ test/aref_aset.rb     |    1 +
+ test/factor_offset.rb |    6 +++---
+ 4 files changed, 17 insertions(+), 12 deletions(-)
+
+--- ruby-netcdf.orig/ChangeLog
++++ ruby-netcdf/ChangeLog
+@@ -1,3 +1,7 @@
++Tue Dec 14  2010  T Koshiro
++	* netcdfraw.c : nctype2natype : char* -> const char*
++	* test/aref_aset.rb, test/factor_offset.rb : bug fix.
++
+ Mon Dec 13  2010  T Koshiro
+ 	* netcdfraw.c : patch for Ruby 1.9.2
+ 	  - by S Kouketsu (dennou-ruby:003191)
+--- ruby-netcdf.orig/netcdfraw.c
++++ ruby-netcdf/netcdfraw.c
+@@ -427,21 +427,21 @@
+     }
+ }
+ 
+-static char*
++static const char*
+ nctype2natype(int nctype){
+   switch(nctype){
+   case NC_CHAR:
+-    return((char *)"char");
++    return("char");
+   case NC_BYTE:
+-    return((char *)"byte");
++    return("byte");
+   case NC_SHORT:
+-    return((char *)"sint");
++    return("sint");
+   case NC_INT:
+-    return((char *)"int");
++    return("int");
+   case NC_FLOAT:
+-    return((char *)"sfloat");
++    return("sfloat");
+   case NC_DOUBLE:
+-    return((char *)"float");
++    return("float");
+   default:
+     rb_raise(rb_eNetcdfError, "No such netcdf type number %d\n",nctype);
+   }
+@@ -1476,7 +1476,7 @@
+   int varid;
+   int status;
+   char *att_name;
+-  char *Attname;
++  const char *Attname;
+   struct NetCDFAtt *Netcdf_att;
+   nc_type xtypep;
+ 
+@@ -1710,7 +1710,7 @@
+   int varid;
+   nc_type xtypep;
+   struct NetCDFVar *Netcdf_var;
+-  char *Vartype;
++  const char *Vartype;
+   
+   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
+   
+--- ruby-netcdf.orig/test/aref_aset.rb
++++ ruby-netcdf/test/aref_aset.rb
+@@ -30,6 +30,7 @@
+ p '*1*',v[1]
+ p '*2*',v[3..4],v.rank
+ p '*3*',v[[2,0,0]]
++vxy = f.var('xy')
+ p '*4*',vxy[[2,0],[0,2,1]]
+ p '*5*',vxy[1,[2,0,1]]
+ p '*6*',vxy[[4,3],2]
+--- ruby-netcdf.orig/test/factor_offset.rb
++++ ruby-netcdf/test/factor_offset.rb
+@@ -44,10 +44,10 @@
+ p v31
+ p v32
+ 
+-print "** scaled_get type fixed to sfloat\n"
+-NetCDFVar.scaled_get_type = NArray::SFLOAT
++print "** unpack type fixed to sfloat\n"
++NetCDFVar.unpack_type = NArray::SFLOAT
+ v33 = v3.scaled_get
+ p v33
+-NetCDFVar.scaled_get_type = NArray::INT
++NetCDFVar.unpack_type = NArray::INT
+ v33 = v3.scaled_get
+ p v33
diff --git a/debian/patches/series b/debian/patches/series
index 859d4b6..8010ccc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 SupportRuby1.9.2
 ChangeNArrayDir
 ChangeTestPath
+cvshead20101214

-- 
Ruby interface of NetCDF library