More fixes needed where *printf expects a double and gets a long double if --enabel-longdouble.

4 files changed, 34 insertions, 34 deletions

diff --git a/fontforge/cvstroke.c b/fontforge/cvstroke.c
index 47e8b046..6cc2a501 100644
--- a/fontforge/cvstroke.c
+++ b/fontforge/cvstroke.c
@@ -1945,7 +1945,7 @@ return( true );
 return( true );
 	PatternSCBounds(patternsc,&b);
 	height = width * (b.maxy - b.miny)/(b.maxx - b.minx);
-	sprintf( buffer, "%g", height );
+	sprintf( buffer, "%g", (double) height );
 	GGadgetSetTitle8(GWidgetGetControl(gw,CID_THeight), buffer);
     }
 return( true );
@@ -1973,7 +1973,7 @@ return( true );
 return( true );
 	PatternSCBounds(patternsc,&b);
 	width = height * (b.maxx - b.minx)/(b.maxy - b.miny);
-	sprintf( buffer, "%g", width );
+	sprintf( buffer, "%g", (double) width );
 	GGadgetSetTitle8(GWidgetGetControl(gw,CID_TWidth), buffer);
     }
 return( true );
@@ -2146,12 +2146,12 @@ static struct pattern *PatternEdit(struct layer_dlg *ld,struct pattern *active)
     if ( active!=NULL ) {
 	SplineChar *patternsc = SFGetChar(ld->sf,-1,active->pattern);
 	name = active->pattern;
-	sprintf( width, "%g", active->width );
-	sprintf( height, "%g", active->height );
+	sprintf( width, "%g", (double) active->width );
+	sprintf( height, "%g", (double) active->height );
 	sprintf( transform, "[%g %g %g %g %g %g]",
-		active->transform[0], active->transform[1],
-		active->transform[2], active->transform[3],
-		active->transform[4], active->transform[5]);
+		(double) active->transform[0], (double) active->transform[1],
+		(double) active->transform[2], (double) active->transform[3],
+		(double) active->transform[4], (double) active->transform[5]);
 	if ( patternsc!=NULL ) {
 	    DBounds b;
 	    PatternSCBounds(patternsc,&b);
@@ -3133,9 +3133,9 @@ int LayerDialog(Layer *layer,SplineFont *sf) {
     gcd[gcdoff++].creator = GLabelCreate;
     shvarray[k++] = &gcd[gcdoff-1];
 
-    sprintf( transbuf, "[%.4g %.4g %.4g %.4g]", layer->stroke_pen.trans[0],
-	    layer->stroke_pen.trans[1], layer->stroke_pen.trans[2],
-	    layer->stroke_pen.trans[3]);
+    sprintf( transbuf, "[%.4g %.4g %.4g %.4g]", (double) layer->stroke_pen.trans[0],
+	    (double) layer->stroke_pen.trans[1], (double) layer->stroke_pen.trans[2],
+	    (double) layer->stroke_pen.trans[3]);
     label[gcdoff].text = (unichar_t *) transbuf;
     label[gcdoff].text_is_1byte = true;
     gcd[gcdoff].gd.label = &label[gcdoff];
diff --git a/fontforge/print.c b/fontforge/print.c
index f55dda9c..362b68bf 100644
--- a/fontforge/print.c
+++ b/fontforge/print.c
@@ -418,8 +418,8 @@ static void pdf_BrushCheck(PI *pi,struct glyph_res *gr,struct brush *brush,
 	function_obj = pdf_addobject(pi);
 	fprintf( pi->out, "<<\n" );
 	fprintf( pi->out, "  /FunctionType 0\n" );	/* Iterpolation between samples */
-	fprintf( pi->out, "  /Domain [%g %g]\n", grad->grad_stops[0].offset,
-		grad->grad_stops[grad->stop_cnt-1].offset );
+	fprintf( pi->out, "  /Domain [%g %g]\n", (double) grad->grad_stops[0].offset,
+		(double) grad->grad_stops[grad->stop_cnt-1].offset );
 	fprintf( pi->out, "  /Range [0 1.0 0 1.0 0 1.0]\n" );
 	fprintf( pi->out, "  /Size [%d]\n", grad->stop_cnt==2?2:101 );
 	fprintf( pi->out, "  /BitsPerSample 8\n" );
@@ -479,11 +479,11 @@ static void pdf_BrushCheck(PI *pi,struct glyph_res *gr,struct brush *brush,
 	fprintf( pi->out, "  /ColorSpace /DeviceRGB\n" );
 	if ( grad->radius==0 ) {
 	    fprintf( pi->out, "  /Coords [%g %g %g %g]\n",
-		    grad->start.x, grad->start.y, grad->stop.x, grad->stop.y);
+		    (double) grad->start.x, (double) grad->start.y, (double) grad->stop.x, (double) grad->stop.y);
 	} else {
 	    fprintf( pi->out, "  /Coords [%g %g 0 %g %g %g]\n",
-		    grad->start.x, grad->start.y, grad->stop.x, grad->stop.y,
-		    grad->radius );
+		    (double) grad->start.x, (double) grad->start.y, (double) grad->stop.x, (double) grad->stop.y,
+		    (double) grad->radius );
 	}
 	fprintf( pi->out, "  /Function %d 0 R\n", function_obj );
 	fprintf( pi->out, "  /Extend [true true]\n" );	/* implies pad */
@@ -526,15 +526,15 @@ static void pdf_BrushCheck(PI *pi,struct glyph_res *gr,struct brush *brush,
 	fprintf( pi->out, "  /PatternType 1\n" );
 	fprintf( pi->out, "  /PaintType 1\n" );		/* The intricacies of uncolored tiles are not something into which I wish to delve */
 	fprintf( pi->out, "  /TilingType 1\n" );
-	fprintf( pi->out, "  /BBox [%g %g %g %g]\n", b.minx, b.miny, b.maxx, b.maxy );
-	fprintf( pi->out, "  /XStep %g\n", b.maxx-b.minx );
-	fprintf( pi->out, "  /YStep %g\n", b.maxy-b.miny );
+	fprintf( pi->out, "  /BBox [%g %g %g %g]\n", (double) b.minx, (double) b.miny, (double) b.maxx, (double) b.maxy );
+	fprintf( pi->out, "  /XStep %g\n", (double) (b.maxx-b.minx) );
+	fprintf( pi->out, "  /YStep %g\n", (double) (b.maxy-b.miny) );
 	memset(scale,0,sizeof(scale));
 	scale[0] = pat->width/(b.maxx-b.minx);
 	scale[3] = pat->height/(b.maxy-b.miny);
 	MatMultiply(scale,pat->transform, result);
-	fprintf( pi->out, "  /Matrix [%g %g %g %g %g %g]\n", result[0], result[1],
-		result[2], result[3], result[4], result[5]);
+	fprintf( pi->out, "  /Matrix [%g %g %g %g %g %g]\n", (double) result[0], (double) result[1],
+		(double) result[2], (double) result[3], (double) result[4], (double) result[5]);
 	fprintf( pi->out, "    /Resources " );
 	respos = ftell(pi->out);
 	fprintf( pi->out, "000000 0 R\n" );
@@ -768,7 +768,7 @@ static int pdf_charproc(PI *pi, SplineChar *sc) {
 	SplineCharFindBounds(sc,&b);
 	fprintf( pi->out, "%d 0 %g %g %g %g d1\n",
 		sc->width,
-		b.minx, b.miny, b.maxx, b.maxy );
+		(double) b.minx, (double) b.miny, (double) b.maxx, (double) b.maxy );
     } else
 	fprintf( pi->out, "%d 0 d0\n", sc->width );
 
diff --git a/fontforge/sfd.c b/fontforge/sfd.c
index 9193f42d..4771cef0 100644
--- a/fontforge/sfd.c
+++ b/fontforge/sfd.c
@@ -1209,10 +1209,10 @@ static void SFDDumpPattern(FILE *sfd, char *keyword, struct pattern *pattern) {
 
     fprintf( sfd, "%s %s %g;%g [%g %g %g %g %g %g]\n", keyword,
 	    pattern->pattern,
-	    pattern->width, pattern->height,
-	    pattern->transform[0], pattern->transform[1],
-	    pattern->transform[2], pattern->transform[3],
-	    pattern->transform[4], pattern->transform[5] );
+	    (double) pattern->width, (double) pattern->height,
+	    (double) pattern->transform[0], (double) pattern->transform[1],
+	    (double) pattern->transform[2], (double) pattern->transform[3],
+	    (double) pattern->transform[4], (double) pattern->transform[5] );
 }
 #endif
 
@@ -1304,8 +1304,8 @@ static void SFDDumpChar(FILE *sfd,SplineChar *sc,EncMap *map,int *newgids) {
 		    sc->layers[i].fill_brush.col, sc->layers[i].fill_brush.opacity,
 		    sc->layers[i].stroke_pen.brush.col, sc->layers[i].stroke_pen.brush.opacity,
 		     sc->layers[i].stroke_pen.width, joins[sc->layers[i].stroke_pen.linejoin], caps[sc->layers[i].stroke_pen.linecap],
-		    sc->layers[i].stroke_pen.trans[0], sc->layers[i].stroke_pen.trans[1],
-		    sc->layers[i].stroke_pen.trans[2], sc->layers[i].stroke_pen.trans[3] );
+		    (double) sc->layers[i].stroke_pen.trans[0], (double) sc->layers[i].stroke_pen.trans[1],
+		    (double) sc->layers[i].stroke_pen.trans[2], (double) sc->layers[i].stroke_pen.trans[3] );
 	    if ( sc->layers[i].stroke_pen.dashes[0]==0 && sc->layers[i].stroke_pen.dashes[1]==DASH_INHERITED )
 		fprintf(sfd,"0 %d]\n", DASH_INHERITED);
 	    else { int j;
diff --git a/fontforge/svg.c b/fontforge/svg.c
index 36674777..2ed6c53d 100644
--- a/fontforge/svg.c
+++ b/fontforge/svg.c
@@ -268,7 +268,7 @@ static void svg_dumpstroke(FILE *file, struct pen *cpen, struct pen *fallback,
 /*  will give us the splines we desire. */
     if ( pen.trans[0]!=1.0 || pen.trans[3]!=1.0 || pen.trans[1]!=0 || pen.trans[2]!=0 )
 	fprintf( file, "transform=\"matrix(%g, %g, %g, %g, 0, 0)\" ",
-		pen.trans[0], pen.trans[1], pen.trans[2], pen.trans[3] );
+		(double) pen.trans[0], (double) pen.trans[1], (double) pen.trans[2], (double) pen.trans[3] );
     if ( pen.dashes[0]==0 && pen.dashes[1]==DASH_INHERITED ) {
 	fprintf( file, "stroke-dasharray=\"inherit\" " );
     } else if ( pen.dashes[0]!=0 ) {
@@ -508,7 +508,7 @@ static void svg_dumppattern(FILE *file,struct pattern *pattern,
 	PatternSCBounds(pattern_sc,&b);
 	fprintf( file, "\n\tviewBox=\"%g %g %g %g\"",
 		(double) b.minx, (double) b.miny,
-		(double) b.maxx-b.minx, (double) b.maxy-b.miny );
+		(double) (b.maxx-b.minx), (double) (b.maxy-b.miny) );
     }
     fprintf( file, "\n\twidth=\"%g\" height=\"%g\"",
 	    (double) pattern->width, (double) pattern->height );
@@ -516,9 +516,9 @@ static void svg_dumppattern(FILE *file,struct pattern *pattern,
 	    pattern->transform[2]!=0 || pattern->transform[3]!=1 ||
 	    pattern->transform[4]!=0 || pattern->transform[5]!=0 ) {
 	fprintf( file, "\n\tpatternTransform=\"matrix(%g %g %g %g %g %g)\"",
-		pattern->transform[0], pattern->transform[1],
-		pattern->transform[2], pattern->transform[3],
-		pattern->transform[4], pattern->transform[5] );
+		(double) pattern->transform[0], (double) pattern->transform[1],
+		(double) pattern->transform[2], (double) pattern->transform[3],
+		(double) pattern->transform[4], (double) pattern->transform[5] );
     }
     if ( pattern_sc!=NULL )
 	svg_dumpscdefs(file,pattern_sc,patsubname,false);
@@ -615,8 +615,8 @@ static void svg_dumptype3(FILE *file,SplineChar *sc,char *name,int istop) {
 	    base = images->image->list_len==0 ? images->image->u.image :
 		    images->image->u.images[0];
 	    fprintf(file, "\twidth=\"%g\"\n\theight=\"%g\"\n",
-		    base->width*images->xscale, base->height*images->yscale );
-	    fprintf(file, "\tx=\"%g\"\n\ty=\"%g\"\n", images->xoff, images->yoff );
+		    (double) (base->width*images->xscale), (double) (base->height*images->yscale) );
+	    fprintf(file, "\tx=\"%g\"\n\ty=\"%g\"\n", (double) images->xoff, (double) images->yoff );
 	    fprintf(file, "\txlink:href=\"data:" );
 	    DataURI_ImageDump(file,images->image);
 	    fprintf(file, "\" />\n" );