Warning fixes
parent
3cc520e98c
commit
f9f321ca84
|
@ -90,7 +90,7 @@ void ssglWriteText(const char *str, double h, Vector t, Vector u, Vector v,
|
|||
Vector p = t;
|
||||
p = p.Plus(u.ScaledBy((xo + x)*scale));
|
||||
p = p.Plus(v.ScaledBy((yo + y)*scale));
|
||||
if(prevp.x != VERY_POSITIVE) {
|
||||
if(EXACT(prevp.x != VERY_POSITIVE)) {
|
||||
fn(fndata, prevp, p);
|
||||
}
|
||||
prevp = p;
|
||||
|
|
|
@ -1270,7 +1270,7 @@ void GraphicsWindow::SpaceNavigatorMoved(double tx, double ty, double tz,
|
|||
// but it's given with respect to screen projection frame
|
||||
aa = aa.ScaleOutOfCsys(projRight, projUp, out);
|
||||
double aam = aa.Magnitude();
|
||||
if(aam != 0.0) aa = aa.WithMagnitude(1);
|
||||
if(aam > 0.0) aa = aa.WithMagnitude(1);
|
||||
|
||||
// This can either transform our view, or transform an imported part.
|
||||
GroupSelection();
|
||||
|
@ -1313,7 +1313,7 @@ void GraphicsWindow::SpaceNavigatorMoved(double tx, double ty, double tz,
|
|||
offset = offset.Plus(projUp.ScaledBy(ty/scale));
|
||||
scale *= exp(0.001*tz);
|
||||
|
||||
if(aam != 0.0) {
|
||||
if(aam > 0.0) {
|
||||
projRight = projRight.RotatedAbout(aa, -aam);
|
||||
projUp = projUp. RotatedAbout(aa, -aam);
|
||||
NormalizeProjectionVectors();
|
||||
|
|
|
@ -506,6 +506,10 @@ public:
|
|||
FILE *f;
|
||||
Vector ptMin, ptMax;
|
||||
|
||||
// This quells the Clang++ warning "'VectorFileWriter' has virtual
|
||||
// functions but non-virtual destructor"
|
||||
virtual ~VectorFileWriter() {}
|
||||
|
||||
static double MmToPts(double mm);
|
||||
|
||||
static VectorFileWriter *ForFile(char *file);
|
||||
|
|
|
@ -109,7 +109,7 @@ void TtfFont::LoadGlyph(int index) {
|
|||
int16_t xMax = (int16_t)GetUSHORT();
|
||||
int16_t yMax = (int16_t)GetUSHORT();
|
||||
|
||||
if(useGlyph['A'] == index) {
|
||||
if(useGlyph[(int)'A'] == index) {
|
||||
scale = (1024*1024) / yMax;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue