Commit 719a7fb4 authored by OTB Bot's avatar OTB Bot

correction warning visual 7.1

parent e4b4151e
......@@ -1771,7 +1771,7 @@ L130:
case 2: goto L73;
case 3: goto L74;
}
return 0;
/*< end >*/
} /* gmd92_ */
......
......@@ -82,7 +82,8 @@ Extern struct {
doublereal psl[51102] /* was [1002][51] */, its, ron, spl, piz, xpl[
51], xpk, trp;
integer snt, ntp;
doublereal xpj, ypk, acu2, inm1[51], inm2[51];
doublereal xpj, ypk, inm1[51], inm2[51];
doublereal acu2 = 0.;
integer mum1;
doublereal ppp1, ppp2, aaaa, scaa, accu, altc[31], bpjk, xdel[31], ydel[
31], nbmu, taup, beta0, xmus, accu2, beta2, cscaa, bpjmk;
......
......@@ -12,6 +12,7 @@ INCLUDE_DIRECTORIES(${OTB6S_SOURCE_DIR})
# Inform header files they are being included from a source inside the
# otb_6S library.
ADD_DEFINITIONS(-DOTB_6S_SRC)
ADD_DEFINITIONS(-DNON_POSIX_STDIO)
# On Microsoft Visual
IF(WIN32)
......
......@@ -44,7 +44,7 @@ dtime_(float *tarray)
static double t0;
double t = clock();
tarray[1] = 0;
tarray[0] = (t - t0) / CLOCKS_PER_SECOND;
tarray[0] = (float)((t - t0) / CLOCKS_PER_SECOND);
t0 = t;
return tarray[0];
#else
......
......@@ -43,7 +43,7 @@ etime_(float *tarray)
#endif
double t = clock();
tarray[1] = 0;
return tarray[0] = t / CLOCKS_PER_SECOND;
return tarray[0] = (float)(t / CLOCKS_PER_SECOND);
#else
struct tms t;
......
......@@ -47,11 +47,11 @@ lbit_cshift(integer a, integer b, integer len)
full_len:
if (b >= 0) {
b %= LONGBITS;
return (integer)(x << b | x >> LONGBITS -b );
return (integer)(x << b | x >> (LONGBITS -b) );
}
b = -b;
b %= LONGBITS;
return (integer)(x << LONGBITS - b | x >> b);
return (integer)( x << (LONGBITS - b) | x >> b);
}
y = z = (unsigned long)-1;
y <<= len;
......@@ -60,11 +60,11 @@ lbit_cshift(integer a, integer b, integer len)
x &= z;
if (b >= 0) {
b %= len;
return (integer)(y | z & (x << b | x >> len - b));
return (integer)(y | z & (x << b | x >> (len - b)));
}
b = -b;
b %= len;
return (integer)(y | z & (x >> b | x << len - b));
return (integer)(y | z & (x >> b | x << (len - b)));
}
#ifdef __cplusplus
}
......
......@@ -68,7 +68,7 @@ rd_Z(Uint *n, int w, ftnlen len)
return errno = 115;
w = (int)len;
w1 = s - s0;
w2 = w1+1 >> 1;
w2 = (w1+1) >> 1;
t = (char *)n;
if (*(char *)&one) {
/* little endian */
......@@ -90,7 +90,7 @@ rd_Z(Uint *n, int w, ftnlen len)
t += i;
}
do {
*t = hex[*s0 & 0xff]-1 << 4 | hex[s0[1] & 0xff]-1;
*t = (hex[*s0 & 0xff]-1) << 4 | hex[s0[1] & 0xff]-1;
t += i;
s0 += 2;
}
......
......@@ -4,6 +4,8 @@
#include "otb_6S_f2c.h"
#include "fio.h"
#include "lio.h"
#include <ctype.h>
#include <stdio.h>
#define MAX_NL_CACHE 3 /* maximum number of namelist hash tables to cache */
#define MAXDIM 20 /* maximum number of subscripts */
......
......@@ -569,8 +569,12 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
*, integer *, integer *, doublereal *, doublereal *, doublereal *)
, roujbrdf_(doublereal *, doublereal *, doublereal *, integer *,
integer *, doublereal *, doublereal *, doublereal *);
doublereal sbrdftmp[3] /* was [3][1] */, qlumet, ulumet, rqfet,
rufet, xtphi;
doublereal sbrdftmp[3] /* was [3][1] */,
xtphi;
doublereal ulumet=0;
doublereal rqfet=0;
doublereal qlumet=0;
doublereal rufet=0;
extern /* Subroutine */ int dirpopol_(doublereal *, doublereal *,
doublereal *), pressure_(doublereal *, doublereal *, doublereal *)
;
......@@ -604,7 +608,8 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
doublereal *, integer *, integer *, integer *, doublereal *,
doublereal *, doublereal *, doublereal *, doublereal *, integer *,
doublereal *);
doublereal ul, ea0, ee0, elsesdpaer, pi2;
doublereal ea0, ee0, elsesdpaer, pi2;
doublereal ul=0;
integer mu2;
doublereal uo3;
extern /* Subroutine */ int specinterp_(doublereal *, doublereal *,
......
......@@ -436,10 +436,15 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
doublereal *, doublereal *, doublereal *, doublereal *,
doublereal *, doublereal *, doublereal *, doublereal *);
doublereal rqatm2, ruatm2, tdirqu, rqmeas2, rumeas2, qlumeas, ulumeas,
qlumet, ulumet, rqfet, rufet, xtphi, refet_fi__[181], roatm_fi__[
10860] /* was [3][20][181] */, height_z__[101], phi_wind__,
xtphi, refet_fi__[181], roatm_fi__[
10860] /* was [3][20][181] */, height_z__[101],
rfoamave, brdfints[2499] /* was [51][49] */, romix_fi__[181],
rglitave;
doublereal qlumet = 0;
doublereal phi_wind__ = 0;
doublereal rqfet = 0;
doublereal rufet = 0;
doublereal ulumet = 0;
extern /* Subroutine */ int dirpopol_(doublereal *, doublereal *,
doublereal *), pressure_(doublereal *, doublereal *, doublereal *)
;
......@@ -455,9 +460,11 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
integer ik;
doublereal sb, gp[49], fr, pi, es, xa, xb, xc;
integer np;
doublereal rm[51], ro, rp[49], wl;
doublereal rm[51], ro, rp[49];
doublereal wl=0;
integer nt, mu;
doublereal tu, ul, uw, ea0, ee0, elsesdpaer, pi2;
doublereal tu, uw, ea0, ee0, elsesdpaer, pi2;
doublereal ul=0;
integer mu2;
doublereal uo3;
extern /* Subroutine */ int specinterp_(doublereal *, doublereal *,
......@@ -466,7 +473,8 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
doublereal robarpstar, fae, cfi, ani[6] /* was [2][3] */, rad, seb,
fra, sha, tdd, anr[6] /* was [2][3] */, phi, roc, roe, etn,
rog, avr, dtr, esn, xle, tdu, tsd, its, swl, xpp, xlt, xps, puw,
tsu, azw, pps, pws, ea0n, ee0n;
tsu, azw, pps, ea0n, ee0n;
doublereal pws=0;
integer nfi;
extern /* Subroutine */ int us62_();
doublereal phi0;
......@@ -490,7 +498,8 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
char file2[80];
doublereal palt, xla0n, ratm1, ratm2, ratm3, robarbarstar, puoz, xpol,
edifa, cscaa, coefa, uo3us, coefb, coefc;
integer iread, ibrdf, aerod;
integer iread, aerod;
integer ibrdf=0;
doublereal dgasm, asaer, robar[1501], taer55, refet, tgasm, filut[1025]
/* was [25][41] */, rpfet, ugasm, tamoy, taerp, romix, trayp,
dtott, rqmix, rumix, rolut[1025] /* was [25][41] */, astot,
......@@ -498,9 +507,10 @@ flectance \002,t79,\002*\002,/,\002*\002,6x,\002 Lambertian case : \002,1x\
puwus, dgtot, tgtot, robar1, robar2, refet1, refet2, refet3,
coefp, ugtot, edifr, rpfet1, rpfet2, rpfet3, tdird, tdiru, tdifd,
tdifu, rsurf, tmdir, tmdif;
integer igeom, month, idatm, iaerp, iwave, igrou1;
integer igeom, month, idatm, iaerp, iwave;
integer igrou1 = 0;
doublereal xnorm1, xnorm2;
integer igrou2;
integer igrou2 = 0;
doublereal sddica, dtdica;
integer isort, irapp;
doublereal iscama, puo3us;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment