Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[9747] trunk/src
|
From: <sm...@us...> - 2009-03-16 15:29:17
|
Revision: 9747
http://plplot.svn.sourceforge.net/plplot/?rev=9747&view=rev
Author: smekal
Date: 2009-03-16 15:29:08 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
To get rid of Visual C++ warnings explicit type casts were added, unreferenced variables removed.
In addition hershey_to_unicode_lookup_table[jmid].Hershey was converted to signed integer in if clauses since we don't loose information - the number range is from 1 and 2932 at the moment.
Modified Paths:
--------------
trunk/src/plbox.c
trunk/src/plcore.c
trunk/src/plline.c
trunk/src/plsym.c
Modified: trunk/src/plbox.c
===================================================================
--- trunk/src/plbox.c 2009-03-16 15:25:43 UTC (rev 9746)
+++ trunk/src/plbox.c 2009-03-16 15:29:08 UTC (rev 9747)
@@ -389,8 +389,8 @@
/* Draw the horizontal axis */
if (lax) {
- plP_movphy(vppxmi, yp0);
- plP_draphy(vppxma, yp0);
+ plP_movphy(vppxmi, (PLINT)yp0);
+ plP_draphy(vppxma, (PLINT)yp0);
if (ltx) {
tp = xtick1 * floor(vpwxmi / xtick1);
for (;;) {
@@ -400,20 +400,20 @@
for (i = 0; i <= 7; i++) {
temp = tp + xlog[i];
if (BETW(temp, vpwxmi, vpwxma))
- plxtik(plP_wcpcx(temp), yp0, xminor, xminor);
+ plxtik(plP_wcpcx(temp), (PLINT)yp0, xminor, xminor);
}
}
else {
for (i = 1; i <= nxsub1 - 1; i++) {
temp = tp + i * xtick1 / nxsub1;
if (BETW(temp, vpwxmi, vpwxma))
- plxtik(plP_wcpcx(temp), yp0, xminor, xminor);
+ plxtik(plP_wcpcx(temp), (PLINT)yp0, xminor, xminor);
}
}
}
if (!BETW(tn, vpwxmi, vpwxma))
break;
- plxtik(plP_wcpcx(tn), yp0, xmajor, xmajor);
+ plxtik(plP_wcpcx(tn), (PLINT)yp0, xmajor, xmajor);
tp = tn;
}
}
@@ -422,8 +422,8 @@
/* Draw the vertical axis */
if (lay) {
- plP_movphy(xp0, vppymi);
- plP_draphy(xp0, vppyma);
+ plP_movphy((PLINT)xp0, vppymi);
+ plP_draphy((PLINT)xp0, vppyma);
if (lty) {
tp = ytick1 * floor(vpwymi / ytick1);
for (;;) {
@@ -433,20 +433,20 @@
for (i = 0; i <= 7; i++) {
temp = tp + xlog[i];
if (BETW(temp, vpwymi, vpwyma))
- plytik(xp0, plP_wcpcy(temp), yminor, yminor);
+ plytik((PLINT)xp0, plP_wcpcy(temp), yminor, yminor);
}
}
else {
for (i = 1; i <= nysub1 - 1; i++) {
temp = tp + i * ytick1 / nysub1;
if (BETW(temp, vpwymi, vpwyma))
- plytik(xp0, plP_wcpcy(temp), yminor, yminor);
+ plytik((PLINT)xp0, plP_wcpcy(temp), yminor, yminor);
}
}
}
if (!BETW(tn, vpwymi, vpwyma))
break;
- plytik(xp0, plP_wcpcy(tn), ymajor, ymajor);
+ plytik((PLINT)xp0, plP_wcpcy(tn), ymajor, ymajor);
tp = tn;
}
}
@@ -1203,7 +1203,6 @@
PLFLT pos, tn, tp, offset, height;
PLFLT factor, tstart;
const char *timefmt;
- double t;
/* Set plot options from input */
Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c 2009-03-16 15:25:43 UTC (rev 9746)
+++ trunk/src/plcore.c 2009-03-16 15:29:08 UTC (rev 9747)
@@ -921,8 +921,8 @@
if (plsc->difilt & PLDI_MAP) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->dimxax * xscl[i] + plsc->dimxb;
- yscl[i] = plsc->dimyay * yscl[i] + plsc->dimyb;
+ xscl[i] = (PLINT)(plsc->dimxax * xscl[i] + plsc->dimxb);
+ yscl[i] = (PLINT)(plsc->dimyay * yscl[i] + plsc->dimyb);
}
}
@@ -930,8 +930,8 @@
if (plsc->difilt & PLDI_ORI) {
for (i = 0; i < npts; i++) {
- x = plsc->dioxax * xscl[i] + plsc->dioxay * yscl[i] + plsc->dioxb;
- y = plsc->dioyax * xscl[i] + plsc->dioyay * yscl[i] + plsc->dioyb;
+ x = (PLINT)(plsc->dioxax * xscl[i] + plsc->dioxay * yscl[i] + plsc->dioxb);
+ y = (PLINT)(plsc->dioyax * xscl[i] + plsc->dioyay * yscl[i] + plsc->dioyb);
xscl[i] = x;
yscl[i] = y;
}
@@ -941,8 +941,8 @@
if (plsc->difilt & PLDI_PLT) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->dipxax * xscl[i] + plsc->dipxb;
- yscl[i] = plsc->dipyay * yscl[i] + plsc->dipyb;
+ xscl[i] = (PLINT)(plsc->dipxax * xscl[i] + plsc->dipxb);
+ yscl[i] = (PLINT)(plsc->dipyay * yscl[i] + plsc->dipyb);
}
}
@@ -951,8 +951,8 @@
if (plsc->difilt & PLDI_DEV) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->didxax * xscl[i] + plsc->didxb;
- yscl[i] = plsc->didyay * yscl[i] + plsc->didyb;
+ xscl[i] = (PLINT)(plsc->didxax * xscl[i] + plsc->didxb);
+ yscl[i] = (PLINT)(plsc->didyay * yscl[i] + plsc->didyb);
}
*clpxmi = plsc->diclpxmi;
*clpxma = plsc->diclpxma;
@@ -978,8 +978,8 @@
if (plsc->difilt & PLDI_MAP) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->dimxax * xscl[i] + plsc->dimxb;
- yscl[i] = plsc->dimyay * yscl[i] + plsc->dimyb;
+ xscl[i] = (PLINT)(plsc->dimxax * xscl[i] + plsc->dimxb);
+ yscl[i] = (PLINT)(plsc->dimyay * yscl[i] + plsc->dimyb);
}
}
@@ -987,8 +987,8 @@
if (plsc->difilt & PLDI_ORI) {
for (i = 0; i < npts; i++) {
- x = plsc->dioxax * xscl[i] + plsc->dioxay * yscl[i] + plsc->dioxb;
- y = plsc->dioyax * xscl[i] + plsc->dioyay * yscl[i] + plsc->dioyb;
+ x = (PLINT)(plsc->dioxax * xscl[i] + plsc->dioxay * yscl[i] + plsc->dioxb);
+ y = (PLINT)(plsc->dioyax * xscl[i] + plsc->dioyay * yscl[i] + plsc->dioyb);
xscl[i] = x;
yscl[i] = y;
}
@@ -998,8 +998,8 @@
if (plsc->difilt & PLDI_PLT) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->dipxax * xscl[i] + plsc->dipxb;
- yscl[i] = plsc->dipyay * yscl[i] + plsc->dipyb;
+ xscl[i] = (PLINT)(plsc->dipxax * xscl[i] + plsc->dipxb);
+ yscl[i] = (PLINT)(plsc->dipyay * yscl[i] + plsc->dipyb);
}
}
@@ -1008,13 +1008,13 @@
if (plsc->difilt & PLDI_DEV) {
for (i = 0; i < npts; i++) {
- xscl[i] = plsc->didxax * xscl[i] + plsc->didxb;
- yscl[i] = plsc->didyay * yscl[i] + plsc->didyb;
+ xscl[i] = (PLINT)(plsc->didxax * xscl[i] + plsc->didxb);
+ yscl[i] = (PLINT)(plsc->didyay * yscl[i] + plsc->didyb);
}
- *clpxmi = plsc->diclpxmi;
- *clpxma = plsc->diclpxma;
- *clpymi = plsc->diclpymi;
- *clpyma = plsc->diclpyma;
+ *clpxmi = (PLINT)(plsc->diclpxmi);
+ *clpxma = (PLINT)(plsc->diclpxma);
+ *clpymi = (PLINT)(plsc->diclpymi);
+ *clpyma = (PLINT)(plsc->diclpyma);
}
else {
*clpxmi = plsc->phyxmi;
@@ -1111,10 +1111,10 @@
sxmax = (pxmax - plsc->didxb) / plsc->didxax;
symax = (pymax - plsc->didyb) / plsc->didyay;
- rxmin = plP_pcdcx(sxmin);
- rymin = plP_pcdcy(symin);
- rxmax = plP_pcdcx(sxmax);
- rymax = plP_pcdcy(symax);
+ rxmin = plP_pcdcx((PLINT)sxmin);
+ rymin = plP_pcdcy((PLINT)symin);
+ rxmax = plP_pcdcx((PLINT)sxmax);
+ rymax = plP_pcdcy((PLINT)symax);
*xmin = (rxmin < 0) ? 0 : rxmin;
*xmax = (rxmax > 1) ? 1 : rxmax;
@@ -1157,10 +1157,10 @@
sxmax = pxmax * plsc->didxax + plsc->didxb;
symax = pymax * plsc->didyay + plsc->didyb;
- rxmin = plP_pcdcx(sxmin);
- rymin = plP_pcdcy(symin);
- rxmax = plP_pcdcx(sxmax);
- rymax = plP_pcdcy(symax);
+ rxmin = plP_pcdcx((PLINT)sxmin);
+ rymin = plP_pcdcy((PLINT)symin);
+ rxmax = plP_pcdcx((PLINT)sxmax);
+ rymax = plP_pcdcy((PLINT)symax);
*xmin = (rxmin < 0) ? 0 : rxmin;
*xmax = (rxmax > 1) ? 1 : rxmax;
@@ -1377,10 +1377,10 @@
/* Set clip limits to conform to new page size */
- plsc->diclpxmi = plsc->didxax * plsc->phyxmi + plsc->didxb;
- plsc->diclpxma = plsc->didxax * plsc->phyxma + plsc->didxb;
- plsc->diclpymi = plsc->didyay * plsc->phyymi + plsc->didyb;
- plsc->diclpyma = plsc->didyay * plsc->phyyma + plsc->didyb;
+ plsc->diclpxmi = (PLINT)(plsc->didxax * plsc->phyxmi + plsc->didxb);
+ plsc->diclpxma = (PLINT)(plsc->didxax * plsc->phyxma + plsc->didxb);
+ plsc->diclpymi = (PLINT)(plsc->didyay * plsc->phyymi + plsc->didyb);
+ plsc->diclpyma = (PLINT)(plsc->didyay * plsc->phyyma + plsc->didyb);
}
/*--------------------------------------------------------------------------*\
@@ -3362,8 +3362,8 @@
{
plsc->xpmm = xpmm;
plsc->ypmm = ypmm;
- plsc->umx = 1000.0 / plsc->xpmm;
- plsc->umy = 1000.0 / plsc->ypmm;
+ plsc->umx = (PLINT)(1000.0 / plsc->xpmm);
+ plsc->umy = (PLINT)(1000.0 / plsc->ypmm);
}
/* Sets up physical limits of plotting device. */
Modified: trunk/src/plline.c
===================================================================
--- trunk/src/plline.c 2009-03-16 15:25:43 UTC (rev 9746)
+++ trunk/src/plline.c 2009-03-16 15:29:08 UTC (rev 9747)
@@ -177,8 +177,8 @@
v0 = plP_wcpcy(plP_w3wcy( p0[0], p0[1], p0[2] ));
u1 = plP_wcpcx(plP_w3wcx( p1[0], p1[1], p1[2] ));
v1 = plP_wcpcy(plP_w3wcy( p1[0], p1[1], p1[2] ));
- plP_movphy(u0,v0);
- plP_draphy(u1,v1);
+ plP_movphy((PLINT)u0,(PLINT)v0);
+ plP_draphy((PLINT)u1,(PLINT)v1);
}
}
return;
@@ -315,8 +315,8 @@
v0 = plP_wcpcy(plP_w3wcy( p0[0], p0[1], p0[2] ));
u1 = plP_wcpcx(plP_w3wcx( p1[0], p1[1], p1[2] ));
v1 = plP_wcpcy(plP_w3wcy( p1[0], p1[1], p1[2] ));
- plP_movphy(u0,v0);
- plP_draphy(u1,v1);
+ plP_movphy((PLINT)u0,(PLINT)v0);
+ plP_draphy((PLINT)u1,(PLINT)v1);
}
}
return;
@@ -1251,7 +1251,7 @@
nxstep = nxp * plsc->umx;
nystep = nyp * plsc->umy;
- tstep = sqrt( nxstep * nxstep + nystep * nystep ) / modulo;
+ tstep = (PLINT)(sqrt( nxstep * nxstep + nystep * nystep ) / modulo);
if (tstep < 1) tstep = 1;
/* tstep is distance per pixel moved */
Modified: trunk/src/plsym.c
===================================================================
--- trunk/src/plsym.c 2009-03-16 15:25:43 UTC (rev 9746)
+++ trunk/src/plsym.c 2009-03-16 15:29:08 UTC (rev 9747)
@@ -176,8 +176,8 @@
z[i] >= zmin && z[i] <= zmax) {
u = plP_wcpcx(plP_w3wcx( x[i], y[i], z[i] ));
v = plP_wcpcy(plP_w3wcy( x[i], y[i], z[i] ));
- plP_movphy(u,v);
- plP_draphy(u,v);
+ plP_movphy((PLINT)u,(PLINT)v);
+ plP_draphy((PLINT)u,(PLINT)v);
}
}
}
@@ -192,7 +192,7 @@
z[i] >= zmin && z[i] <= zmax) {
u = plP_wcpcx(plP_w3wcx( x[i], y[i], z[i] ));
v = plP_wcpcy(plP_w3wcy( x[i], y[i], z[i] ));
- plhrsh(sym, u, v);
+ plhrsh(sym, (PLINT)u, (PLINT)v);
}
}
}
@@ -1174,9 +1174,12 @@
* jlo < jmid < jhi and jmid must be in valid range.
*/
jmid = (jlo+jhi)/2;
- if (in > hershey_to_unicode_lookup_table[jmid].Hershey)
+ /* convert hershey_to_unicode_lookup_table[jmid].Hershey to signed
+ integer since we don't loose information - the number range
+ is from 1 and 2932 at the moment */
+ if (in > (int)(hershey_to_unicode_lookup_table[jmid].Hershey))
jlo = jmid;
- else if (in < hershey_to_unicode_lookup_table[jmid].Hershey)
+ else if (in < (int)(hershey_to_unicode_lookup_table[jmid].Hershey))
jhi = jmid;
else
/* We have found it!
@@ -1370,8 +1373,8 @@
* The calculation is also dependent of the orientation
* (perpendicular or parallel) of the text. */
- xpc = plP_dcmmx(plP_pcdcx(xpc));
- ypc = plP_dcmmy(plP_pcdcy(ypc)) - dispy;
+ xpc = plP_dcmmx(plP_pcdcx((PLINT)xpc));
+ ypc = plP_dcmmy(plP_pcdcy((PLINT)ypc)) - dispy;
shift = plstrl(text) * just;
@@ -1397,7 +1400,7 @@
xform[1] = -cos(theta);
xform[2] = 1.0;
xform[3] = -sin(theta);
- plP_text(0, just, xform, xpc, ypc, xrefpc, yrefpc, text);
+ plP_text(0, just, xform, (PLINT)xpc, (PLINT)ypc, (PLINT)xrefpc, (PLINT)yrefpc, text);
}
/* parallel, rotate & shear by angle */
@@ -1407,7 +1410,7 @@
xform[2] = sin(theta);
xform[3] = 1.0;
- plP_text(0, just, xform, xpc, ypc, xrefpc, yrefpc, text);
+ plP_text(0, just, xform, (PLINT)xpc, (PLINT)ypc, (PLINT)xrefpc, (PLINT)yrefpc, text);
}
}
@@ -1532,8 +1535,8 @@
/* 4. Compute the reference point. */
- xpc = plP_dcmmx(plP_pcdcx(xpc)) + dispx;
- ypc = plP_dcmmy(plP_pcdcy(ypc)) + dispy;
+ xpc = plP_dcmmx(plP_pcdcx((PLINT)xpc)) + dispx;
+ ypc = plP_dcmmy(plP_pcdcy((PLINT)ypc)) + dispy;
shift = plstrl(text) * just;
@@ -1558,7 +1561,7 @@
xform[2] = sin(theta);
xform[3] = 1.0;
- plP_text(0, just, xform, xpc, ypc, xrefpc, yrefpc, text);
+ plP_text(0, just, xform, (PLINT)xpc, (PLINT)ypc, (PLINT)xrefpc, (PLINT)yrefpc, text);
}
else {
@@ -1567,7 +1570,7 @@
xform[2] = 1.0;
xform[3] = -sin(theta);
- plP_text(0, just, xform, xpc, ypc, xrefpc, yrefpc, text);
+ plP_text(0, just, xform, (PLINT)xpc, (PLINT)ypc, (PLINT)xrefpc, (PLINT)yrefpc, text);
}
}
@@ -1655,8 +1658,8 @@
stride = stride/sqrt(x_dx*x_dx + y_dy*y_dy + z_dz*z_dz);
/* compute the reference point */
- xpc = plP_dcmmx(plP_pcdcx(xpc));
- ypc = plP_dcmmy(plP_pcdcy(ypc));
+ xpc = plP_dcmmx(plP_pcdcx((PLINT)xpc));
+ ypc = plP_dcmmy(plP_pcdcy((PLINT)ypc));
shift = plstrl(text) * just;
xrefpc = xpc - cos(theta) * shift;
@@ -1673,7 +1676,7 @@
xform[2] = sin(theta) * stride;
xform[3] = sin(theta) * sin(phi) + cos(theta) * cos(phi);
- plP_text(0, just, xform, xpc, ypc, xrefpc, yrefpc, text);
+ plP_text(0, just, xform, (PLINT)xpc, (PLINT)ypc, (PLINT)xrefpc, (PLINT)yrefpc, text);
}
/*------------------------------------------------------------------------*\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|