Skip to content

Commit 4bf7589

Browse files
committed
Fix warnings
1 parent 75b7e5e commit 4bf7589

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

Sources/vger/vger.mm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ void vgerFillCircle(vgerContext vg, vector_float2 center, float radius, vgerPain
199199

200200
vgerPrim prim {
201201
.type = vgerCircle,
202-
.cvs = { center },
202+
.width = 0.0,
203203
.radius = radius,
204+
.cvs = { center },
204205
.paint = paint.index,
205-
.width = 0.0,
206206
.xform = vg->addxform(vg->txStack.back())
207207
};
208208

@@ -215,9 +215,9 @@ void vgerStrokeArc(vgerContext vg, vector_float2 center, float radius, float wid
215215

216216
vgerPrim prim {
217217
.type = vgerArc,
218+
.width = width,
218219
.radius = radius,
219220
.cvs = { center, {sin(rotation), cos(rotation)}, {sin(aperture), cos(aperture)} },
220-
.width = width,
221221
.paint = paint.index,
222222
.xform = vg->addxform(vg->txStack.back())
223223
};
@@ -246,8 +246,8 @@ void vgerStrokeRect(vgerContext vg, vector_float2 min, vector_float2 max, float
246246

247247
vgerPrim prim {
248248
.type = vgerRectStroke,
249-
.radius = radius,
250249
.width = width,
250+
.radius = radius,
251251
.cvs = { min, max },
252252
.paint = paint.index,
253253
.xform = vg->addxform(vg->txStack.back())
@@ -529,12 +529,12 @@ void vgerText(vgerContext vg, const char* str, float4 color, int align) {
529529
vgerPrim prim = {
530530
.type = vgerGlyph,
531531
.paint = paint.index,
532+
.xform = xform,
532533
.quadBounds = { a, b },
533534
.texBounds = {
534535
float2{GLYPH_MARGIN, originY},
535536
float2{GLYPH_MARGIN+w, originY-h}
536537
},
537-
.xform = xform
538538
};
539539

540540
prim.glyph = info.regionIndex;
@@ -816,10 +816,10 @@ void vgerTextBoxBounds(vgerContext vg, const char* str, float breakRowWidth, flo
816816

817817
vgerPrim prim = {
818818
.type = vgerPathFill,
819+
.start = static_cast<uint32_t>(scenes[currentScene].cvs.count),
820+
.count = uint16_t(n),
819821
.paint = paint.index,
820822
.xform = xform,
821-
.start = static_cast<uint32_t>(scenes[currentScene].cvs.count),
822-
.count = uint16_t(n)
823823
};
824824

825825
Interval xInt{FLT_MAX, -FLT_MAX};

0 commit comments

Comments
 (0)