[GRASS-SVN] r72143 - grass/trunk/imagery/i.atcorr

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Jan 25 12:59:45 PST 2018


Author: mmetz
Date: 2018-01-25 12:59:45 -0800 (Thu, 25 Jan 2018)
New Revision: 72143

Modified:
   grass/trunk/imagery/i.atcorr/i.atcorr.html
   grass/trunk/imagery/i.atcorr/iwave.cpp
Log:
i.atcorr: update Spot6

Modified: grass/trunk/imagery/i.atcorr/i.atcorr.html
===================================================================
--- grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 20:55:55 UTC (rev 72142)
+++ grass/trunk/imagery/i.atcorr/i.atcorr.html	2018-01-25 20:59:45 UTC (rev 72143)
@@ -662,11 +662,11 @@
 <tr><td>118</td><td>GeoEye 1 Red Band (653nm - 697nm)</td></tr>
 <tr><td>120</td><td>GeoEye 1 NIR Band (770nm - 932nm)</td></tr>
 
-<tr><td>129</td><td><b>Spot6</b> Blue band (455nm - 525nm)</td></tr>
-<tr><td>130</td><td>Spot6 Green band  (530nm - 527nm)</td></tr>
-<tr><td>131</td><td>Spot6 Red band  (625nm - 695nm)</td></tr>
-<tr><td>132</td><td>Spot6 NIR band  (760nm - 890nm)</td></tr>
-<tr><td>133</td><td>Spot6 Pan band  (455nm - 745nm)</td></tr>
+<tr><td>129</td><td><b>Spot6</b> Blue band (440nm - 532nm)</td></tr>
+<tr><td>130</td><td>Spot6 Green band (515nm - 600nm)</td></tr>
+<tr><td>131</td><td>Spot6 Red band (610nm - 710nm)</td></tr>
+<tr><td>132</td><td>Spot6 NIR band (738nm - 897nm)</td></tr>
+<tr><td>133</td><td>Spot6 Pan band (438nm - 760nm)</td></tr>
 
 <tr><td>134</td><td><b>Spot7</b> Blue band (455nm - 525nm)</td></tr>
 <tr><td>135</td><td>Spot7 Green band  (530nm - 527nm)</td></tr>

Modified: grass/trunk/imagery/i.atcorr/iwave.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 20:55:55 UTC (rev 72142)
+++ grass/trunk/imagery/i.atcorr/iwave.cpp	2018-01-25 20:59:45 UTC (rev 72143)
@@ -3397,182 +3397,119 @@
 {
 
     /* Spot6 Blue of spot6 */
-    static const float sr1[241] = {
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0002, .0002, .0005, .0012, .0022, .0039, .0084,
-		.0182, .0319, .0680, .1467, .2649, .4506, .6147, .7798,
-		.8575, .8527, .8532, .8547, .8756, .9153, .9331, .9370,
-		.9338, .9225, .9209, .9396, .9636, .9747, .9664, .9522,
-		.9582, .9861, 1.0000, .9973, .9840, .9234, .8339, .6537,
-		.4313, .2393, .1046, .0502, .0279, .0156, .0081, .0049,
-		.0033, .0024, .0017, .0012, .0009, .0006, .0005, .0005,
-		.0004, .0004, .0003, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0002, .0002, .0002, .0002, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0002, .0002, .0002, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0002, .0002,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    static const float sr1[202] = {
+        .0001, .0001, .0001, .0001, .0001, .0001, .0002, .0002,
+        .0005, .0012, .0022, .0039, .0084, .0182, .0319, .0680,
+        .1467, .2649, .4506, .6147, .7798, .8575, .8527, .8532,
+        .8547, .8756, .9153, .9331, .9370, .9338, .9225, .9209,
+        .9396, .9636, .9747, .9664, .9522, .9582, .9861, 1.0000,
+        .9973, .9840, .9234, .8339, .6537, .4313, .2393, .1046,
+        .0502, .0279, .0156, .0081, .0049, .0033, .0024, .0017,
+        .0012, .0009, .0006, .0005, .0005, .0004, .0004, .0003,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0002, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0002, .0002, .0002, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0002, .0002, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0002, .0002,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0001,
+        .0001, .0001
     };
 	
-    /* spot6 Green of spot6 */
-    static const float sr2[241] = {
-		.0000, .0000, .0000, .0000, .0001, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0001, .0001, .0001, .0001, .0002, .0003,
-		.0004, .0006, .0010, .0019, .0033, .0061, .0127, .0313,
-		.0704, .1541, .3075, .5195, .7467, .9229, 1.0057, 1.0230,
-		1.0212, 1.0164, 1.0096, 1.0029, .9996, 1.0026, 1.0091, 1.0100,
-		.9990, .9815, .9702, .9709, .9807, .9944, .9991, .9871,
-		.9639, .8850, .7236, .5325, .2984, .1244, .0510, .0246,
-		.0118, .0055, .0025, .0013, .0008, .0006, .0004, .0003,
-		.0002, .0002, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0001, .0001, .0001, .0001, .0001, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0001, .0001, .0000, .0000,
-		.0001, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    /* Spot6 Green of spot6 */
+    static const float sr2[72] = {
+        .0001, .0001, .0001, .0002, .0003, .0004, .0006, .0010,
+        .0019, .0033, .0061, .0127, .0313, .0704, .1541, .3075,
+        .5195, .7467, .9229, 1.0057, 1.0230, 1.0212, 1.0164, 1.0096,
+        1.0029, .9996, 1.0026, 1.0091, 1.0100, .9990, .9815, .9702,
+        .9709, .9807, .9944, .9991, .9871, .9639, .8850, .7236,
+        .5325, .2984, .1244, .0510, .0246, .0118, .0055, .0025,
+        .0013, .0008, .0006, .0004, .0003, .0002, .0002, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
+        .0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001
+
     };
 	
-    /* spot6 Red of spot6 */
-    static const float sr3[241] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0001, .0001, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0001, .0001, .0000,
-		.0001, .0001, .0001, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0001, .0001, .0001, .0002, .0003, .0004, .0005, .0006,
-		.0009, .0016, .0031, .0065, .0125, .0222, .0387, .0747,
-		.1634, .3494, .5463, .7600, .9267, .9767, .9951, .9979,
-		.9662, .9217, .8987, .9033, .9255, .9573, .9887, 1.0107,
-		1.0137, .9960, .9674, .9391, .9198, .9138, .9211, .9366,
-		.9466, .9308, .8765, .7978, .6985, .5868, .4715, .3531,
-		.2351, .1401, .0776, .0416, .0206, .0098, .0045, .0023,
-		.0013, .0008, .0005, .0005, .0004, .0003, .0003, .0002,
-		.0001, .0001, .0000, .0000, .0000, .0000, .0001, .0001,
-		.0001, .0002, .0001, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0001, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    /* Spot6 Red of spot6 */
+    static const float sr3[75] = {
+        .0001, .0001, .0002, .0003, .0004, .0005, .0006, .0009,
+        .0016, .0031, .0065, .0125, .0222, .0387, .0747, .1634,
+        .3494, .5463, .7600, .9267, .9767, .9951, .9979, .9662,
+        .9217, .8987, .9033, .9255, .9573, .9887, 1.0107, 1.0137,
+        .9960, .9674, .9391, .9198, .9138, .9211, .9366, .9466,
+        .9308, .8765, .7978, .6985, .5868, .4715, .3531, .2351,
+        .1401, .0776, .0416, .0206, .0098, .0045, .0023, .0013,
+        .0008, .0005, .0005, .0004, .0003, .0003, .0002, .0001,
+        .0001, .0000, .0000, .0000, .0000, .0001, .0001, .0001,
+        .0002, .0001, .0000
     };
 	
-    /* spot6 NIR of spot6 */
-    static const float sr4[241] = {
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0008, .0008, .0010, .0000, .0000,
-		.0000, .0001, .0001, .0001, .0001, .0000, .0000, .0000,
-		.0000, .0001, .0001, .0001, .0001, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0001,
-		.0001, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
-		.0002, .0002, .0003, .0003, .0003, .0003, .0003, .0004,
-		.0005, .0006, .0006, .0004, .0003, .0001, .0001, .0001,
-		.0001, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0001, .0001,
-		.0001, .0001, .0001, .0002, .0002, .0003, .0004, .0005,
-		.0007, .0010, .0014, .0019, .0028, .0042, .0065, .0104,
-		.0170, .0290, .0496, .0862, .1462, .2549, .3877, .5465,
-		.7084, .8466, .9436, .9893, 1.0000, .9932, .9834, .9753,
-		.9694, .9633, .9552, .9448, .9330, .9201, .9087, .8988,
-		.8904, .8829, .8749, .8643, .8520, .8377, .8224, .8081,
-		.7954, .7842, .7751, .7670, .7592, .7514, .7431, .7336,
-		.7233, .7118, .6987, .6841, .6699, .6567, .6454, .6366,
-		.6299, .6230, .6150, .6053, .5943, .5805, .5570, .5102,
-		.4427, .3607, .2673, .1717, .0941, .0480, .0243, .0132,
-		.0074, .0046, .0029, .0020, .0014, .0011, .0008, .0007,
-		.0006, .0005, .0004, .0003, .0003, .0002, .0002, .0001,
-		.0001, .0001, .0001, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    /* Spot6 NIR of spot6 */
+    static const float sr4[200] = {
+        .0000, .0000, .0008, .0008, .0010, .0000, .0000, .0000,
+        .0001, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
+        .0001, .0001, .0001, .0001, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0001, .0001,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0002, .0002, .0002, .0002, .0002, .0002, .0002,
+        .0002, .0003, .0003, .0003, .0003, .0003, .0004, .0005,
+        .0006, .0006, .0004, .0003, .0001, .0001, .0001, .0001,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
+        .0000, .0000, .0000, .0000, .0000, .0001, .0001, .0001,
+        .0001, .0001, .0002, .0002, .0003, .0004, .0005, .0007,
+        .0010, .0014, .0019, .0028, .0042, .0065, .0104, .0170,
+        .0290, .0496, .0862, .1462, .2549, .3877, .5465, .7084,
+        .8466, .9436, .9893, 1.0000, .9932, .9834, .9753, .9694,
+        .9633, .9552, .9448, .9330, .9201, .9087, .8988, .8904,
+        .8829, .8749, .8643, .8520, .8377, .8224, .8081, .7954,
+        .7842, .7751, .7670, .7592, .7514, .7431, .7336, .7233,
+        .7118, .6987, .6841, .6699, .6567, .6454, .6366, .6299,
+        .6230, .6150, .6053, .5943, .5805, .5570, .5102, .4427,
+        .3607, .2673, .1717, .0941, .0480, .0243, .0132, .0074,
+        .0046, .0029, .0020, .0014, .0011, .0008, .0007, .0006,
+        .0005, .0004, .0003, .0003, .0002, .0002, .0001, .0001
+
     };
 	
-    /* spot6 Pan of spot6 */
-    static const float sr5[241] = {
-		.0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
-		.0003, .0004, .0007, .0010, .0017, .0036, .0066, .0105,
-		.0161, .0327, .0717, .1335, .2227, .3529, .5156, .6744,
-		.7759, .8080, .8143, .8112, .8188, .8450, .8704, .8801,
-		.8818, .8903, .9054, .9170, .9198, .9199, .9258, .9378,
-		.9461, .9454, .9412, .9432, .9542, .9668, .9732, .9716,
-		.9700, .9751, .9831, .9870, .9830, .9731, .9665, .9703,
-		.9820, .9939, .9973, .9903, .9797, .9738, .9773, .9886,
-		.9989, 1.0017, .9947, .9834, .9750, .9752, .9831, .9934,
-		.9995, .9972, .9883, .9779, .9716, .9725, .9790, .9867,
-		.9906, .9880, .9807, .9719, .9663, .9660, .9693, .9736,
-		.9754, .9719, .9638, .9531, .9437, .9383, .9375, .9407,
-		.9449, .9469, .9449, .9373, .9260, .9148, .9056, .9009,
-		.9006, .9039, .9079, .9100, .9088, .9026, .8936, .8832,
-		.8737, .8675, .8649, .8644, .8650, .8654, .8633, .8590,
-		.8522, .8434, .8344, .8267, .8205, .8160, .8128, .8096,
-		.8061, .7995, .7908, .7812, .7707, .7633, .7544, .7290,
-		.6647, .5549, .4157, .2694, .1503, .0778, .0392, .0209,
-		.0115, .0067, .0044, .0026, .0017, .0011, .0008, .0006,
-		.0004, .0003, .0003, .0002, .0002, .0001, .0001, .0001,
-		.0001, .0001, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0001, .0001, .0001, .0001, .0001, .0001, .0001,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000, .0000, .0000, .0000, .0000, .0000, .0000, .0000,
-		.0000
+    /* Spot6 Pan of spot6 */
+    static const float sr5[159] = {
+        .0001, .0001, .0001, .0001, .0002, .0002, .0002, .0002,
+        .0003, .0004, .0007, .0010, .0017, .0036, .0066, .0105,
+        .0161, .0327, .0717, .1335, .2227, .3529, .5156, .6744,
+        .7759, .8080, .8143, .8112, .8188, .8450, .8704, .8801,
+        .8818, .8903, .9054, .9170, .9198, .9199, .9258, .9378,
+        .9461, .9454, .9412, .9432, .9542, .9668, .9732, .9716,
+        .9700, .9751, .9831, .9870, .9830, .9731, .9665, .9703,
+        .9820, .9939, .9973, .9903, .9797, .9738, .9773, .9886,
+        .9989, 1.0017, .9947, .9834, .9750, .9752, .9831, .9934,
+        .9995, .9972, .9883, .9779, .9716, .9725, .9790, .9867,
+        .9906, .9880, .9807, .9719, .9663, .9660, .9693, .9736,
+        .9754, .9719, .9638, .9531, .9437, .9383, .9375, .9407,
+        .9449, .9469, .9449, .9373, .9260, .9148, .9056, .9009,
+        .9006, .9039, .9079, .9100, .9088, .9026, .8936, .8832,
+        .8737, .8675, .8649, .8644, .8650, .8654, .8633, .8590,
+        .8522, .8434, .8344, .8267, .8205, .8160, .8128, .8096,
+        .8061, .7995, .7908, .7812, .7707, .7633, .7544, .7290,
+        .6647, .5549, .4157, .2694, .1503, .0778, .0392, .0209,
+        .0115, .0067, .0044, .0026, .0017, .0011, .0008, .0006,
+        .0004, .0003, .0003, .0002, .0002, .0001, .0001
     };
 	
-    static const float wli[5] = {0.400, 0.400, 0.400, 0.400, 0.400};
-    static const float wls[5] = {1.000, 1.000, 1.000, 1.000, 1.000};
+    static const float wli[5] = {0.4075, 0.4875, 0.5825, 0.4425, 0.4000};
+    static const float wls[5] = {0.9125, 0.6675, 0.7700, 0.9425, 0.7975};
 
     ffu.wlinf = (float)wli[iwa-1];
     ffu.wlsup = (float)wls[iwa-1];
@@ -3582,15 +3519,15 @@
 
     switch(iwa)
     {
-    case 1: for(i = 0; i < 241; i++)  ffu.s[60+i] = sr1[i];
+    case 1: for(i = 0; i < 202; i++)  ffu.s[63+i] = sr1[i];
         break;
-    case 2: for(i = 0; i < 241; i++)  ffu.s[60+i] = sr2[i];
+    case 2: for(i = 0; i < 72; i++)  ffu.s[95+i] = sr2[i];
         break;
-    case 3: for(i = 0; i < 241; i++)  ffu.s[60+i] = sr3[i];
+    case 3: for(i = 0; i < 75; i++)  ffu.s[133+i] = sr3[i];
         break;
-    case 4: for(i = 0; i < 241; i++)  ffu.s[60+i] = sr4[i];
+    case 4: for(i = 0; i < 200; i++)  ffu.s[77+i] = sr4[i];
         break;
-    case 5: for(i = 0; i < 241; i++)  ffu.s[60+i] = sr5[i];
+    case 5: for(i = 0; i < 159; i++)  ffu.s[60+i] = sr5[i];
         break;
     }
 }



More information about the grass-commit mailing list