forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v2.103 compatibility

This commit is contained in:
Adam D. Ruppe 2023-04-05 10:46:33 -04:00
parent 1a3c8a4f36
commit 2ff74269fe
10 changed files with 95 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core.d
View File

@ -3982,8 +3982,6 @@ private class CoreEventLoopImplementation : ICoreEventLoop {
callback.release(); callback.release();
} }
alias queue this;
} }
// there's a global instance of this we refer back to // there's a global instance of this we refer back to

2
dom.d
View File

@ -2107,7 +2107,7 @@ class Element : DomParent {
return cast(inout) prev.parent_.asDocument; return cast(inout) prev.parent_.asDocument;
} }
deprecated @property void parentDocument(Document doc) { /*deprecated*/ @property void parentDocument(Document doc) {
parent_ = doc; parent_ = doc;
} }

18
jpeg.d
View File

@ -745,7 +745,7 @@ private:
Element_Type[NUM_COLS][NUM_ROWS] v; Element_Type[NUM_COLS][NUM_ROWS] v;
this() (in auto ref Matrix44 m) { this() (const scope auto ref Matrix44 m) {
foreach (immutable r; 0..NUM_ROWS) v[r][] = m.v[r][]; foreach (immutable r; 0..NUM_ROWS) v[r][] = m.v[r][];
} }
@ -754,7 +754,7 @@ private:
ref inout(Element_Type) at (int r, int c) inout { pragma(inline, true); return v.ptr[r].ptr[c]; } ref inout(Element_Type) at (int r, int c) inout { pragma(inline, true); return v.ptr[r].ptr[c]; }
ref Matrix44 opOpAssign(string op:"+") (in auto ref Matrix44 a) { ref Matrix44 opOpAssign(string op:"+") (const scope auto ref Matrix44 a) {
foreach (int r; 0..NUM_ROWS) { foreach (int r; 0..NUM_ROWS) {
at(r, 0) += a.at(r, 0); at(r, 0) += a.at(r, 0);
at(r, 1) += a.at(r, 1); at(r, 1) += a.at(r, 1);
@ -764,7 +764,7 @@ private:
return this; return this;
} }
ref Matrix44 opOpAssign(string op:"-") (in auto ref Matrix44 a) { ref Matrix44 opOpAssign(string op:"-") (const scope auto ref Matrix44 a) {
foreach (int r; 0..NUM_ROWS) { foreach (int r; 0..NUM_ROWS) {
at(r, 0) -= a.at(r, 0); at(r, 0) -= a.at(r, 0);
at(r, 1) -= a.at(r, 1); at(r, 1) -= a.at(r, 1);
@ -774,7 +774,7 @@ private:
return this; return this;
} }
Matrix44 opBinary(string op:"+") (in auto ref Matrix44 b) const { Matrix44 opBinary(string op:"+") (const scope auto ref Matrix44 b) const {
alias a = this; alias a = this;
Matrix44 ret; Matrix44 ret;
foreach (int r; 0..NUM_ROWS) { foreach (int r; 0..NUM_ROWS) {
@ -786,7 +786,7 @@ private:
return ret; return ret;
} }
Matrix44 opBinary(string op:"-") (in auto ref Matrix44 b) const { Matrix44 opBinary(string op:"-") (const scope auto ref Matrix44 b) const {
alias a = this; alias a = this;
Matrix44 ret; Matrix44 ret;
foreach (int r; 0..NUM_ROWS) { foreach (int r; 0..NUM_ROWS) {
@ -798,7 +798,7 @@ private:
return ret; return ret;
} }
static void add_and_store() (jpgd_block_t* pDst, in auto ref Matrix44 a, in auto ref Matrix44 b) { static void add_and_store() (jpgd_block_t* pDst, const scope auto ref Matrix44 a, const scope auto ref Matrix44 b) {
foreach (int r; 0..4) { foreach (int r; 0..4) {
pDst[0*8 + r] = cast(jpgd_block_t)(a.at(r, 0) + b.at(r, 0)); pDst[0*8 + r] = cast(jpgd_block_t)(a.at(r, 0) + b.at(r, 0));
pDst[1*8 + r] = cast(jpgd_block_t)(a.at(r, 1) + b.at(r, 1)); pDst[1*8 + r] = cast(jpgd_block_t)(a.at(r, 1) + b.at(r, 1));
@ -807,7 +807,7 @@ private:
} }
} }
static void sub_and_store() (jpgd_block_t* pDst, in auto ref Matrix44 a, in auto ref Matrix44 b) { static void sub_and_store() (jpgd_block_t* pDst, const scope auto ref Matrix44 a, const scope auto ref Matrix44 b) {
foreach (int r; 0..4) { foreach (int r; 0..4) {
pDst[0*8 + r] = cast(jpgd_block_t)(a.at(r, 0) - b.at(r, 0)); pDst[0*8 + r] = cast(jpgd_block_t)(a.at(r, 0) - b.at(r, 0));
pDst[1*8 + r] = cast(jpgd_block_t)(a.at(r, 1) - b.at(r, 1)); pDst[1*8 + r] = cast(jpgd_block_t)(a.at(r, 1) - b.at(r, 1));
@ -3646,7 +3646,7 @@ bool compress_image_to_jpeg_file (const(char)[] fname, int width, int height, in
/// Writes JPEG image to file. /// Writes JPEG image to file.
/// num_channels must be 1 (Y), 3 (RGB), 4 (RGBA), image pitch must be width*num_channels. /// num_channels must be 1 (Y), 3 (RGB), 4 (RGBA), image pitch must be width*num_channels.
/// note that alpha will not be stored in jpeg file. /// note that alpha will not be stored in jpeg file.
bool compress_image_to_jpeg_file() (const(char)[] fname, int width, int height, int num_channels, const(ubyte)[] pImage_data, in auto ref JpegParams comp_params) { bool compress_image_to_jpeg_file() (const(char)[] fname, int width, int height, int num_channels, const(ubyte)[] pImage_data, const scope auto ref JpegParams comp_params) {
import std.internal.cstring; import std.internal.cstring;
import core.stdc.stdio : FILE, fopen, fclose, fwrite; import core.stdc.stdio : FILE, fopen, fclose, fwrite;
FILE* fl = fopen(fname.tempCString, "wb"); FILE* fl = fopen(fname.tempCString, "wb");
@ -4537,7 +4537,7 @@ public:
// width, height - Image dimensions. // width, height - Image dimensions.
// channels - May be 1, or 3. 1 indicates grayscale, 3 indicates RGB source data. // channels - May be 1, or 3. 1 indicates grayscale, 3 indicates RGB source data.
// Returns false on out of memory or if a stream write fails. // Returns false on out of memory or if a stream write fails.
bool setup() (WriteFunc pStream, int width, int height, int src_channels, in auto ref JpegParams comp_params) { bool setup() (WriteFunc pStream, int width, int height, int src_channels, const scope auto ref JpegParams comp_params) {
deinit(); deinit();
if ((pStream is null || width < 1 || height < 1) || (src_channels != 1 && src_channels != 3 && src_channels != 4) || !comp_params.check()) return false; if ((pStream is null || width < 1 || height < 1) || (src_channels != 1 && src_channels != 3 && src_channels != 4) || !comp_params.check()) return false;
m_pStream = pStream; m_pStream = pStream;

9
jsvar.d
View File

@ -2522,7 +2522,12 @@ WrappedNativeObject wrapNativeObject(Class, bool special = false)(Class obj) if(
_properties[memberName] = var(os); _properties[memberName] = var(os);
} else { } else {
static if(.isScriptable!(__traits(getAttributes, __traits(getMember, Class, memberName)))()) alias fuckThisLanguage = __traits(getOverloads, Class, memberName, true);
static if(fuckThisLanguage.length)
alias fuckYourPointlessDeprecations = fuckThisLanguage[0];
else
alias fuckYourPointlessDeprecations = __traits(getMember, Class, memberName);
static if(.isScriptable!(__traits(getAttributes, fuckYourPointlessDeprecations))())
// if it has a type but is not a function, it is prolly a member // if it has a type but is not a function, it is prolly a member
_properties[memberName] = new PropertyPrototype( _properties[memberName] = new PropertyPrototype(
() => var(__traits(getMember, obj, memberName)), () => var(__traits(getMember, obj, memberName)),
@ -2588,7 +2593,7 @@ WrappedNativeObject wrapUfcs(alias Module, Type)(Type obj) {
foreach(memberName; __traits(allMembers, Module)) static if(is(typeof(__traits(getMember, Module, memberName)) type)) { foreach(memberName; __traits(allMembers, Module)) static if(is(typeof(__traits(getMember, Module, memberName)) type)) {
static if(is(type == function)) { static if(is(type == function)) {
foreach(idx, overload; AliasSeq!(__traits(getOverloads, Module, memberName))) static if(.isScriptable!(__traits(getAttributes, overload))()) { foreach(idx, overload; AliasSeq!(__traits(getOverloads, Module, memberName))) static if(.isScriptable!(__traits(getAttributes, __traits(getOverloads, Module, memberName)[idx]))()) { // lol i have to do the second getOverload to stop the compiler from deprecating
auto helper = &__traits(getOverloads, Module, memberName)[idx]; auto helper = &__traits(getOverloads, Module, memberName)[idx];
static if(Parameters!helper.length >= 1 && is(Parameters!helper[0] == Type)) { static if(Parameters!helper.length >= 1 && is(Parameters!helper[0] == Type)) {
// this staticMap is a bit of a hack so it can handle `in float`... liable to break with others, i'm sure // this staticMap is a bit of a hack so it can handle `in float`... liable to break with others, i'm sure

116
nanovega.d
View File

@ -938,7 +938,7 @@ public:
@property ref inout(float) b () inout pure @trusted { pragma(inline, true); return rgba.ptr[2]; } /// @property ref inout(float) b () inout pure @trusted { pragma(inline, true); return rgba.ptr[2]; } ///
@property ref inout(float) a () inout pure @trusted { pragma(inline, true); return rgba.ptr[3]; } /// @property ref inout(float) a () inout pure @trusted { pragma(inline, true); return rgba.ptr[3]; } ///
ref NVGColor applyTint() (in auto ref NVGColor tint) nothrow @trusted @nogc { ref NVGColor applyTint() (const scope auto ref NVGColor tint) nothrow @trusted @nogc {
if (tint.a == 0) return this; if (tint.a == 0) return this;
foreach (immutable idx, ref float v; rgba[0..4]) { foreach (immutable idx, ref float v; rgba[0..4]) {
v = nvg__clamp(v*tint.rgba.ptr[idx], 0.0f, 1.0f); v = nvg__clamp(v*tint.rgba.ptr[idx], 0.0f, 1.0f);
@ -947,7 +947,7 @@ public:
} }
NVGHSL asHSL() (bool useWeightedLightness=false) const { pragma(inline, true); return NVGHSL.fromColor(this, useWeightedLightness); } /// NVGHSL asHSL() (bool useWeightedLightness=false) const { pragma(inline, true); return NVGHSL.fromColor(this, useWeightedLightness); } ///
static fromHSL() (in auto ref NVGHSL hsl) { pragma(inline, true); return hsl.asColor; } /// static fromHSL() (const scope auto ref NVGHSL hsl) { pragma(inline, true); return hsl.asColor; } ///
static if (NanoVegaHasArsdColor) { static if (NanoVegaHasArsdColor) {
Color toArsd () const { pragma(inline, true); return Color(cast(int)(r*255), cast(int)(g*255), cast(int)(b*255), cast(int)(a*255)); } /// Color toArsd () const { pragma(inline, true); return Color(cast(int)(r*255), cast(int)(g*255), cast(int)(b*255), cast(int)(a*255)); } ///
@ -984,7 +984,7 @@ public:
* [useWeightedLightness] will try to get a better value for luminosity for the human eye, * [useWeightedLightness] will try to get a better value for luminosity for the human eye,
* which is more sensitive to green than red and more to red than blue. * which is more sensitive to green than red and more to red than blue.
* If it is false, it just does average of the rgb. */ * If it is false, it just does average of the rgb. */
static NVGHSL fromColor() (in auto ref NVGColor c, bool useWeightedLightness=false) pure { static NVGHSL fromColor() (const scope auto ref NVGColor c, bool useWeightedLightness=false) pure {
NVGHSL res; NVGHSL res;
res.a = c.a; res.a = c.a;
float r1 = c.r; float r1 = c.r;
@ -1045,7 +1045,7 @@ private:
public: public:
/// ///
this() (in auto ref NVGImage src) nothrow @trusted @nogc { this() (const scope auto ref NVGImage src) nothrow @trusted @nogc {
version(nanovega_debug_image_manager_rc) { import core.stdc.stdio; if (src.id != 0) printf("NVGImage %p created from %p (imgid=%d)\n", &this, src, src.id); } version(nanovega_debug_image_manager_rc) { import core.stdc.stdio; if (src.id != 0) printf("NVGImage %p created from %p (imgid=%d)\n", &this, src, src.id); }
if (src.id > 0 && src.ctx !is null) { if (src.id > 0 && src.ctx !is null) {
ctx = cast(NVGContext)src.ctx; ctx = cast(NVGContext)src.ctx;
@ -1067,7 +1067,7 @@ public:
} }
/// ///
void opAssign() (in auto ref NVGImage src) nothrow @trusted @nogc { void opAssign() (const scope auto ref NVGImage src) nothrow @trusted @nogc {
if (src.id <= 0 || src.ctx is null) { if (src.id <= 0 || src.ctx is null) {
clear(); clear();
} else { } else {
@ -1133,7 +1133,7 @@ public struct NVGPaint {
NVGImage image; NVGImage image;
bool simpleColor; /// if `true`, only innerColor is used, and this is solid-color paint bool simpleColor; /// if `true`, only innerColor is used, and this is solid-color paint
this() (in auto ref NVGPaint p) nothrow @trusted @nogc { this() (const scope auto ref NVGPaint p) nothrow @trusted @nogc {
xform = p.xform; xform = p.xform;
extent[] = p.extent[]; extent[] = p.extent[];
radius = p.radius; radius = p.radius;
@ -1146,7 +1146,7 @@ public struct NVGPaint {
simpleColor = p.simpleColor; simpleColor = p.simpleColor;
} }
void opAssign() (in auto ref NVGPaint p) nothrow @trusted @nogc { void opAssign() (const scope auto ref NVGPaint p) nothrow @trusted @nogc {
xform = p.xform; xform = p.xform;
extent[] = p.extent[]; extent[] = p.extent[];
radius = p.radius; radius = p.radius;
@ -1388,7 +1388,7 @@ struct NVGpath {
bool cloned; bool cloned;
@disable this (this); // no copies @disable this (this); // no copies
void opAssign() (in auto ref NVGpath a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref NVGpath a) { static assert(0, "no copies!"); }
void clear () nothrow @trusted @nogc { void clear () nothrow @trusted @nogc {
import core.stdc.stdlib : free; import core.stdc.stdlib : free;
@ -1448,7 +1448,7 @@ struct NVGparams {
void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, float fringe, const(float)* bounds, const(NVGpath)* paths, int npaths, bool evenOdd) nothrow @trusted @nogc renderFill; void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, float fringe, const(float)* bounds, const(NVGpath)* paths, int npaths, bool evenOdd) nothrow @trusted @nogc renderFill;
void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, float fringe, float strokeWidth, const(NVGpath)* paths, int npaths) nothrow @trusted @nogc renderStroke; void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, float fringe, float strokeWidth, const(NVGpath)* paths, int npaths) nothrow @trusted @nogc renderStroke;
void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, const(NVGVertex)* verts, int nverts) nothrow @trusted @nogc renderTriangles; void function (void* uptr, NVGCompositeOperationState compositeOperation, NVGClipMode clipmode, NVGPaint* paint, NVGscissor* scissor, const(NVGVertex)* verts, int nverts) nothrow @trusted @nogc renderTriangles;
void function (void* uptr, in ref NVGMatrix mat) nothrow @trusted @nogc renderSetAffine; void function (void* uptr, const scope ref NVGMatrix mat) nothrow @trusted @nogc renderSetAffine;
void function (void* uptr) nothrow @trusted @nogc renderDelete; void function (void* uptr) nothrow @trusted @nogc renderDelete;
} }
@ -1551,7 +1551,7 @@ struct NVGpathCache {
int ncommands; int ncommands;
@disable this (this); // no copies @disable this (this); // no copies
void opAssign() (in auto ref NVGpathCache a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref NVGpathCache a) { static assert(0, "no copies!"); }
// won't clear current path // won't clear current path
void copyFrom (const NVGpathCache* src) nothrow @trusted @nogc { void copyFrom (const NVGpathCache* src) nothrow @trusted @nogc {
@ -1749,7 +1749,7 @@ private:
bool contextAlive; // context can be dead, but still contain some images bool contextAlive; // context can be dead, but still contain some images
@disable this (this); // no copies @disable this (this); // no copies
void opAssign() (in auto ref NVGcontextinternal a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref NVGcontextinternal a) { static assert(0, "no copies!"); }
// debug feature // debug feature
public @property int getImageCount () nothrow @trusted @nogc { public @property int getImageCount () nothrow @trusted @nogc {
@ -2249,7 +2249,7 @@ private:
pickscene = ps; pickscene = ps;
} }
void replay (NVGContext ctx, in ref NVGColor fillTint, in ref NVGColor strokeTint) nothrow @trusted @nogc { void replay (NVGContext ctx, const scope ref NVGColor fillTint, const scope ref NVGColor strokeTint) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
foreach (ref node; nodes[0..nnodes]) { foreach (ref node; nodes[0..nnodes]) {
if (auto cc = node.path) { if (auto cc = node.path) {
@ -2309,7 +2309,7 @@ private:
public: public:
@disable this (this); // no copies @disable this (this); // no copies
void opAssign() (in auto ref NVGPathSetS a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref NVGPathSetS a) { static assert(0, "no copies!"); }
// pick test // pick test
// Call delegate [dg] for each path under the specified position (in no particular order). // Call delegate [dg] for each path under the specified position (in no particular order).
@ -2406,7 +2406,7 @@ public:
} }
// Append current path to existing path set. Is is safe to call this with `null` [svp]. // Append current path to existing path set. Is is safe to call this with `null` [svp].
void appendCurrentPathToCache (NVGContext ctx, NVGPathSet svp, in ref NVGPaint paint) nothrow @trusted @nogc { void appendCurrentPathToCache (NVGContext ctx, NVGPathSet svp, const scope ref NVGPaint paint) nothrow @trusted @nogc {
if (ctx is null || svp is null) return; if (ctx is null || svp is null) return;
if (ctx !is svp.svctx) assert(0, "NanoVega: cannot save paths from different contexts"); if (ctx !is svp.svctx) assert(0, "NanoVega: cannot save paths from different contexts");
if (ctx.ncommands == 0) { if (ctx.ncommands == 0) {
@ -2534,13 +2534,13 @@ public void cancelRecording (NVGContext ctx) nothrow @trusted @nogc {
* *
* Group: path_recording * Group: path_recording
*/ */
public void replayRecording() (NVGContext ctx, NVGPathSet svp, in auto ref NVGColor fillTint, in auto ref NVGColor strokeTint) nothrow @trusted @nogc { public void replayRecording() (NVGContext ctx, NVGPathSet svp, const scope auto ref NVGColor fillTint, const scope auto ref NVGColor strokeTint) nothrow @trusted @nogc {
if (svp !is null && svp.svctx !is ctx) assert(0, "NanoVega: cannot share path set between contexts"); if (svp !is null && svp.svctx !is ctx) assert(0, "NanoVega: cannot share path set between contexts");
svp.replay(ctx, fillTint, strokeTint); svp.replay(ctx, fillTint, strokeTint);
} }
/// Ditto. /// Ditto.
public void replayRecording() (NVGContext ctx, NVGPathSet svp, in auto ref NVGColor fillTint) nothrow @trusted @nogc { ctx.replayRecording(svp, fillTint, NVGColor.transparent); } public void replayRecording() (NVGContext ctx, NVGPathSet svp, const scope auto ref NVGColor fillTint) nothrow @trusted @nogc { ctx.replayRecording(svp, fillTint, NVGColor.transparent); }
/// Ditto. /// Ditto.
public void replayRecording (NVGContext ctx, NVGPathSet svp) nothrow @trusted @nogc { ctx.replayRecording(svp, NVGColor.transparent, NVGColor.transparent); } public void replayRecording (NVGContext ctx, NVGPathSet svp) nothrow @trusted @nogc { ctx.replayRecording(svp, NVGColor.transparent, NVGColor.transparent); }
@ -2620,7 +2620,7 @@ public NVGColor nvgTransRGBAf (NVGColor c, float a) nothrow @trusted @nogc {
/// Linearly interpolates from color c0 to c1, and returns resulting color value. /// Linearly interpolates from color c0 to c1, and returns resulting color value.
/// Group: color_utils /// Group: color_utils
public NVGColor nvgLerpRGBA() (in auto ref NVGColor c0, in auto ref NVGColor c1, float u) nothrow @trusted @nogc { public NVGColor nvgLerpRGBA() (const scope auto ref NVGColor c0, const scope auto ref NVGColor c1, float u) nothrow @trusted @nogc {
NVGColor cint = void; NVGColor cint = void;
u = nvg__clamp(u, 0.0f, 1.0f); u = nvg__clamp(u, 0.0f, 1.0f);
float oneminu = 1.0f-u; float oneminu = 1.0f-u;
@ -2816,7 +2816,7 @@ public nothrow @trusted @nogc:
} }
/// Sets this matrix to the result of multiplication of `this` and [s] (this * S). /// Sets this matrix to the result of multiplication of `this` and [s] (this * S).
ref NVGMatrix mul() (in auto ref NVGMatrix s) { ref NVGMatrix mul() (const scope auto ref NVGMatrix s) {
immutable float t0 = mat.ptr[0]*s.mat.ptr[0]+mat.ptr[1]*s.mat.ptr[2]; immutable float t0 = mat.ptr[0]*s.mat.ptr[0]+mat.ptr[1]*s.mat.ptr[2];
immutable float t2 = mat.ptr[2]*s.mat.ptr[0]+mat.ptr[3]*s.mat.ptr[2]; immutable float t2 = mat.ptr[2]*s.mat.ptr[0]+mat.ptr[3]*s.mat.ptr[2];
immutable float t4 = mat.ptr[4]*s.mat.ptr[0]+mat.ptr[5]*s.mat.ptr[2]+s.mat.ptr[4]; immutable float t4 = mat.ptr[4]*s.mat.ptr[0]+mat.ptr[5]*s.mat.ptr[2]+s.mat.ptr[4];
@ -2832,7 +2832,7 @@ public nothrow @trusted @nogc:
/// Sets this matrix to the result of multiplication of [s] and `this` (S * this). /// Sets this matrix to the result of multiplication of [s] and `this` (S * this).
/// Sets the transform to the result of multiplication of two transforms, of A = B*A. /// Sets the transform to the result of multiplication of two transforms, of A = B*A.
/// Group: matrices /// Group: matrices
ref NVGMatrix premul() (in auto ref NVGMatrix s) { ref NVGMatrix premul() (const scope auto ref NVGMatrix s) {
NVGMatrix s2 = s; NVGMatrix s2 = s;
s2.mul(this); s2.mul(this);
mat[] = s2.mat[]; mat[] = s2.mat[];
@ -2841,7 +2841,7 @@ public nothrow @trusted @nogc:
/// Multiply this matrix by [s], return result as new matrix. /// Multiply this matrix by [s], return result as new matrix.
/// Performs operations in this left-to-right order. /// Performs operations in this left-to-right order.
NVGMatrix opBinary(string op="*") (in auto ref NVGMatrix s) const { NVGMatrix opBinary(string op="*") (const scope auto ref NVGMatrix s) const {
version(aliced) pragma(inline, true); version(aliced) pragma(inline, true);
NVGMatrix res = this; NVGMatrix res = this;
res.mul(s); res.mul(s);
@ -2850,7 +2850,7 @@ public nothrow @trusted @nogc:
/// Multiply this matrix by [s]. /// Multiply this matrix by [s].
/// Performs operations in this left-to-right order. /// Performs operations in this left-to-right order.
ref NVGMatrix opOpAssign(string op="*") (in auto ref NVGMatrix s) { ref NVGMatrix opOpAssign(string op="*") (const scope auto ref NVGMatrix s) {
version(aliced) pragma(inline, true); version(aliced) pragma(inline, true);
return this.mul(s); return this.mul(s);
} }
@ -2980,7 +2980,7 @@ public float nvgRadians() (in float rad) pure nothrow @safe @nogc { pragma(inlin
// ////////////////////////////////////////////////////////////////////////// // // ////////////////////////////////////////////////////////////////////////// //
void nvg__setPaintColor() (ref NVGPaint p, in auto ref NVGColor color) nothrow @trusted @nogc { void nvg__setPaintColor() (ref NVGPaint p, const scope auto ref NVGColor color) nothrow @trusted @nogc {
p.clear(); p.clear();
p.xform.identity; p.xform.identity;
p.radius = 0.0f; p.radius = 0.0f;
@ -3226,7 +3226,7 @@ public void strokeColor (NVGContext ctx, Color color) nothrow @trusted @nogc {
/// Sets current stroke style to a solid color. /// Sets current stroke style to a solid color.
/// Group: render_styles /// Group: render_styles
public void strokeColor() (NVGContext ctx, in auto ref NVGColor color) nothrow @trusted @nogc { public void strokeColor() (NVGContext ctx, const scope auto ref NVGColor color) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
nvg__setPaintColor(state.stroke, color); nvg__setPaintColor(state.stroke, color);
} }
@ -3239,7 +3239,7 @@ public void strokePaint(NVGContext ctx, in NVGPaint* paint) nothrow @trusted @no
/// Sets current stroke style to a paint, which can be a one of the gradients or a pattern. /// Sets current stroke style to a paint, which can be a one of the gradients or a pattern.
/// Group: render_styles /// Group: render_styles
@scriptable @scriptable
public void strokePaint() (NVGContext ctx, in auto ref NVGPaint paint) nothrow @trusted @nogc { public void strokePaint() (NVGContext ctx, const scope auto ref NVGPaint paint) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
state.stroke = paint; state.stroke = paint;
//nvgTransformMultiply(state.stroke.xform[], state.xform[]); //nvgTransformMultiply(state.stroke.xform[], state.xform[]);
@ -3262,7 +3262,7 @@ public void fillColor (NVGContext ctx, Color color) nothrow @trusted @nogc {
/// Sets current fill style to a solid color. /// Sets current fill style to a solid color.
/// Group: render_styles /// Group: render_styles
public void fillColor() (NVGContext ctx, in auto ref NVGColor color) nothrow @trusted @nogc { public void fillColor() (NVGContext ctx, const scope auto ref NVGColor color) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
nvg__setPaintColor(state.fill, color); nvg__setPaintColor(state.fill, color);
@ -3276,7 +3276,7 @@ public void fillPaint (NVGContext ctx, in NVGPaint* paint) nothrow @trusted @nog
/// Sets current fill style to a paint, which can be a one of the gradients or a pattern. /// Sets current fill style to a paint, which can be a one of the gradients or a pattern.
/// Group: render_styles /// Group: render_styles
@scriptable @scriptable
public void fillPaint() (NVGContext ctx, in auto ref NVGPaint paint) nothrow @trusted @nogc { public void fillPaint() (NVGContext ctx, const scope auto ref NVGPaint paint) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
state.fill = paint; state.fill = paint;
//nvgTransformMultiply(state.fill.xform[], state.xform[]); //nvgTransformMultiply(state.fill.xform[], state.xform[]);
@ -3285,7 +3285,7 @@ public void fillPaint() (NVGContext ctx, in auto ref NVGPaint paint) nothrow @tr
/// Sets current fill style to a multistop linear gradient. /// Sets current fill style to a multistop linear gradient.
/// Group: render_styles /// Group: render_styles
public void fillPaint() (NVGContext ctx, in auto ref NVGLGS lgs) nothrow @trusted @nogc { public void fillPaint() (NVGContext ctx, const scope auto ref NVGLGS lgs) nothrow @trusted @nogc {
if (!lgs.valid) { if (!lgs.valid) {
NVGPaint p = void; NVGPaint p = void;
memset(&p, 0, p.sizeof); memset(&p, 0, p.sizeof);
@ -3308,7 +3308,7 @@ public NVGMatrix currTransform (NVGContext ctx) pure nothrow @trusted @nogc {
/// Sets current transformation matrix. /// Sets current transformation matrix.
/// Group: render_transformations /// Group: render_transformations
public void currTransform() (NVGContext ctx, in auto ref NVGMatrix m) nothrow @trusted @nogc { public void currTransform() (NVGContext ctx, const scope auto ref NVGMatrix m) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
state.xform = m; state.xform = m;
} }
@ -3323,7 +3323,7 @@ public void resetTransform (NVGContext ctx) nothrow @trusted @nogc {
/// Premultiplies current coordinate system by specified matrix. /// Premultiplies current coordinate system by specified matrix.
/// Group: render_transformations /// Group: render_transformations
public void transform() (NVGContext ctx, in auto ref NVGMatrix mt) nothrow @trusted @nogc { public void transform() (NVGContext ctx, const scope auto ref NVGMatrix mt) nothrow @trusted @nogc {
NVGstate* state = nvg__getState(ctx); NVGstate* state = nvg__getState(ctx);
//nvgTransformPremultiply(state.xform[], t[]); //nvgTransformPremultiply(state.xform[], t[]);
state.xform *= mt; state.xform *= mt;
@ -3490,7 +3490,7 @@ public void updateImage() (NVGContext ctx, auto ref NVGImage image, const(void)[
/// Returns the dimensions of a created image. /// Returns the dimensions of a created image.
/// Group: images /// Group: images
public void imageSize() (NVGContext ctx, in auto ref NVGImage image, out int w, out int h) nothrow @trusted @nogc { public void imageSize() (NVGContext ctx, const scope auto ref NVGImage image, out int w, out int h) nothrow @trusted @nogc {
if (image.valid) { if (image.valid) {
if (image.ctx !is ctx) assert(0, "NanoVega: you cannot use image from one context in another context"); if (image.ctx !is ctx) assert(0, "NanoVega: you cannot use image from one context in another context");
ctx.params.renderGetTextureSize(cast(void*)ctx.params.userPtr, image.id, &w, &h); ctx.params.renderGetTextureSize(cast(void*)ctx.params.userPtr, image.id, &w, &h);
@ -3540,7 +3540,7 @@ public NVGPaint linearGradient (NVGContext ctx, in float sx, in float sy, in flo
* *
* Group: paints * Group: paints
*/ */
public NVGPaint linearGradient() (NVGContext ctx, float sx, float sy, float ex, float ey, in auto ref NVGColor icol, in auto ref NVGColor ocol) nothrow @trusted @nogc { public NVGPaint linearGradient() (NVGContext ctx, float sx, float sy, float ex, float ey, const scope auto ref NVGColor icol, const scope auto ref NVGColor ocol) nothrow @trusted @nogc {
enum large = 1e5f; enum large = 1e5f;
NVGPaint p = void; NVGPaint p = void;
@ -3584,7 +3584,7 @@ public NVGPaint linearGradient() (NVGContext ctx, float sx, float sy, float ex,
* *
* Group: paints * Group: paints
*/ */
public NVGPaint linearGradient() (NVGContext ctx, float sx, float sy, float ex, float ey, in auto ref NVGColor icol, in float midp, in auto ref NVGColor mcol, in auto ref NVGColor ocol) nothrow @trusted @nogc { public NVGPaint linearGradient() (NVGContext ctx, float sx, float sy, float ex, float ey, const scope auto ref NVGColor icol, in float midp, const scope auto ref NVGColor mcol, const scope auto ref NVGColor ocol) nothrow @trusted @nogc {
enum large = 1e5f; enum large = 1e5f;
NVGPaint p = void; NVGPaint p = void;
@ -3648,7 +3648,7 @@ public NVGPaint radialGradient (NVGContext ctx, in float cx, in float cy, in flo
* *
* Group: paints * Group: paints
*/ */
public NVGPaint radialGradient() (NVGContext ctx, float cx, float cy, float inr, float outr, in auto ref NVGColor icol, in auto ref NVGColor ocol) nothrow @trusted @nogc { public NVGPaint radialGradient() (NVGContext ctx, float cx, float cy, float inr, float outr, const scope auto ref NVGColor icol, const scope auto ref NVGColor ocol) nothrow @trusted @nogc {
immutable float r = (inr+outr)*0.5f; immutable float r = (inr+outr)*0.5f;
immutable float f = (outr-inr); immutable float f = (outr-inr);
@ -3696,7 +3696,7 @@ public NVGPaint boxGradient (NVGContext ctx, in float x, in float y, in float w,
* *
* Group: paints * Group: paints
*/ */
public NVGPaint boxGradient() (NVGContext ctx, float x, float y, float w, float h, float r, float f, in auto ref NVGColor icol, in auto ref NVGColor ocol) nothrow @trusted @nogc { public NVGPaint boxGradient() (NVGContext ctx, float x, float y, float w, float h, float r, float f, const scope auto ref NVGColor icol, const scope auto ref NVGColor ocol) nothrow @trusted @nogc {
NVGPaint p = void; NVGPaint p = void;
memset(&p, 0, p.sizeof); memset(&p, 0, p.sizeof);
p.simpleColor = false; p.simpleColor = false;
@ -3725,7 +3725,7 @@ public NVGPaint boxGradient() (NVGContext ctx, float x, float y, float w, float
* *
* Group: paints * Group: paints
*/ */
public NVGPaint imagePattern() (NVGContext ctx, float cx, float cy, float w, float h, float angle, in auto ref NVGImage image, float alpha=1) nothrow @trusted @nogc { public NVGPaint imagePattern() (NVGContext ctx, float cx, float cy, float w, float h, float angle, const scope auto ref NVGImage image, float alpha=1) nothrow @trusted @nogc {
NVGPaint p = void; NVGPaint p = void;
memset(&p, 0, p.sizeof); memset(&p, 0, p.sizeof);
p.simpleColor = false; p.simpleColor = false;
@ -3768,7 +3768,7 @@ public:
* $(WARNING THIS IS EXPERIMENTAL API AND MAY BE CHANGED/BROKEN IN NEXT RELEASES!) * $(WARNING THIS IS EXPERIMENTAL API AND MAY BE CHANGED/BROKEN IN NEXT RELEASES!)
* Group: paints * Group: paints
*/ */
public NVGPaint asPaint() (NVGContext ctx, in auto ref NVGLGS lgs) nothrow @trusted @nogc { public NVGPaint asPaint() (NVGContext ctx, const scope auto ref NVGLGS lgs) nothrow @trusted @nogc {
if (!lgs.valid) { if (!lgs.valid) {
NVGPaint p = void; NVGPaint p = void;
memset(&p, 0, p.sizeof); memset(&p, 0, p.sizeof);
@ -3788,7 +3788,7 @@ public struct NVGGradientStop {
float offset = 0; /// [0..1] float offset = 0; /// [0..1]
NVGColor color; /// NVGColor color; ///
this() (in float aofs, in auto ref NVGColor aclr) nothrow @trusted @nogc { pragma(inline, true); offset = aofs; color = aclr; } /// this() (in float aofs, const scope auto ref NVGColor aclr) nothrow @trusted @nogc { pragma(inline, true); offset = aofs; color = aclr; } ///
static if (NanoVegaHasArsdColor) { static if (NanoVegaHasArsdColor) {
this() (in float aofs, in Color aclr) nothrow @trusted @nogc { pragma(inline, true); offset = aofs; color = NVGColor(aclr); } /// this() (in float aofs, in Color aclr) nothrow @trusted @nogc { pragma(inline, true); offset = aofs; color = NVGColor(aclr); } ///
} }
@ -4020,7 +4020,7 @@ public void resetScissor (NVGContext ctx) nothrow @trusted @nogc {
/// Sets GPU affine transformatin matrix. Don't do scaling or skewing here. /// Sets GPU affine transformatin matrix. Don't do scaling or skewing here.
/// This matrix won't be saved/restored with context state save/restore operations, as it is not a part of that state. /// This matrix won't be saved/restored with context state save/restore operations, as it is not a part of that state.
/// Group: gpu_affine /// Group: gpu_affine
public void affineGPU() (NVGContext ctx, in auto ref NVGMatrix mat) nothrow @trusted @nogc { public void affineGPU() (NVGContext ctx, const scope auto ref NVGMatrix mat) nothrow @trusted @nogc {
ctx.gpuAffine = mat; ctx.gpuAffine = mat;
ctx.params.renderSetAffine(ctx.params.userPtr, ctx.gpuAffine); ctx.params.renderSetAffine(ctx.params.userPtr, ctx.gpuAffine);
} }
@ -4217,7 +4217,7 @@ void nvg__pathWinding (NVGContext ctx, NVGWinding winding) nothrow @trusted @nog
path.mWinding = winding; path.mWinding = winding;
} }
float nvg__getAverageScale() (in auto ref NVGMatrix t) /*pure*/ nothrow @trusted @nogc { float nvg__getAverageScale() (const scope auto ref NVGMatrix t) /*pure*/ nothrow @trusted @nogc {
immutable float sx = nvg__sqrtf(t.mat.ptr[0]*t.mat.ptr[0]+t.mat.ptr[2]*t.mat.ptr[2]); immutable float sx = nvg__sqrtf(t.mat.ptr[0]*t.mat.ptr[0]+t.mat.ptr[2]*t.mat.ptr[2]);
immutable float sy = nvg__sqrtf(t.mat.ptr[1]*t.mat.ptr[1]+t.mat.ptr[3]*t.mat.ptr[3]); immutable float sy = nvg__sqrtf(t.mat.ptr[1]*t.mat.ptr[1]+t.mat.ptr[3]*t.mat.ptr[3]);
return (sx+sy)*0.5f; return (sx+sy)*0.5f;
@ -6506,14 +6506,14 @@ void nvg__expandBounds (ref float[4] bounds, const(float)* points, int npoints)
} }
} }
void nvg__unionBounds (ref float[4] bounds, in ref float[4] boundsB) { void nvg__unionBounds (ref float[4] bounds, const scope ref float[4] boundsB) {
bounds.ptr[0] = nvg__min(bounds.ptr[0], boundsB.ptr[0]); bounds.ptr[0] = nvg__min(bounds.ptr[0], boundsB.ptr[0]);
bounds.ptr[1] = nvg__min(bounds.ptr[1], boundsB.ptr[1]); bounds.ptr[1] = nvg__min(bounds.ptr[1], boundsB.ptr[1]);
bounds.ptr[2] = nvg__max(bounds.ptr[2], boundsB.ptr[2]); bounds.ptr[2] = nvg__max(bounds.ptr[2], boundsB.ptr[2]);
bounds.ptr[3] = nvg__max(bounds.ptr[3], boundsB.ptr[3]); bounds.ptr[3] = nvg__max(bounds.ptr[3], boundsB.ptr[3]);
} }
void nvg__intersectBounds (ref float[4] bounds, in ref float[4] boundsB) { void nvg__intersectBounds (ref float[4] bounds, const scope ref float[4] boundsB) {
bounds.ptr[0] = nvg__max(boundsB.ptr[0], bounds.ptr[0]); bounds.ptr[0] = nvg__max(boundsB.ptr[0], bounds.ptr[0]);
bounds.ptr[1] = nvg__max(boundsB.ptr[1], bounds.ptr[1]); bounds.ptr[1] = nvg__max(boundsB.ptr[1], bounds.ptr[1]);
bounds.ptr[2] = nvg__min(boundsB.ptr[2], bounds.ptr[2]); bounds.ptr[2] = nvg__min(boundsB.ptr[2], bounds.ptr[2]);
@ -6523,7 +6523,7 @@ void nvg__intersectBounds (ref float[4] bounds, in ref float[4] boundsB) {
bounds.ptr[3] = nvg__max(bounds.ptr[1], bounds.ptr[3]); bounds.ptr[3] = nvg__max(bounds.ptr[1], bounds.ptr[3]);
} }
bool nvg__pointInBounds (in float x, in float y, in ref float[4] bounds) { bool nvg__pointInBounds (in float x, in float y, const scope ref float[4] bounds) {
pragma(inline, true); pragma(inline, true);
return (x >= bounds.ptr[0] && x <= bounds.ptr[2] && y >= bounds.ptr[1] && y <= bounds.ptr[3]); return (x >= bounds.ptr[0] && x <= bounds.ptr[2] && y >= bounds.ptr[1] && y <= bounds.ptr[3]);
} }
@ -8157,7 +8157,7 @@ public:
} }
/// perform NanoVega command with stored data, transforming points with [xform] transformation matrix. /// perform NanoVega command with stored data, transforming points with [xform] transformation matrix.
void perform() (NVGContext ctx, in auto ref NVGMatrix xform) const nothrow @trusted @nogc { void perform() (NVGContext ctx, const scope auto ref NVGMatrix xform) const nothrow @trusted @nogc {
if (ctx is null || !valid) return; if (ctx is null || !valid) return;
float[6] pts = void; float[6] pts = void;
pts[0..args.length] = args[]; pts[0..args.length] = args[];
@ -8197,7 +8197,7 @@ public:
this (this) { pragma(inline, true); incRef(cast(DataStore*)dsaddr); } this (this) { pragma(inline, true); incRef(cast(DataStore*)dsaddr); }
~this () { pragma(inline, true); decRef(cast(DataStore*)dsaddr); } ~this () { pragma(inline, true); decRef(cast(DataStore*)dsaddr); }
void opAssign() (in auto ref NVGPathOutline a) { void opAssign() (const scope auto ref NVGPathOutline a) {
incRef(cast(DataStore*)a.dsaddr); incRef(cast(DataStore*)a.dsaddr);
decRef(cast(DataStore*)dsaddr); decRef(cast(DataStore*)dsaddr);
dsaddr = a.dsaddr; dsaddr = a.dsaddr;
@ -8220,7 +8220,7 @@ public:
NVGPathOutline flatten () const { pragma(inline, true); return flattenInternal(null); } NVGPathOutline flatten () const { pragma(inline, true); return flattenInternal(null); }
/// Returns "flattened" path, transformed by the given matrix. Flattened path consists of only two commands kinds: MoveTo and LineTo. /// Returns "flattened" path, transformed by the given matrix. Flattened path consists of only two commands kinds: MoveTo and LineTo.
NVGPathOutline flatten() (in auto ref NVGMatrix mt) const { pragma(inline, true); return flattenInternal(&mt); } NVGPathOutline flatten() (const scope auto ref NVGMatrix mt) const { pragma(inline, true); return flattenInternal(&mt); }
// Returns "flattened" path, transformed by the given matrix. Flattened path consists of only two commands kinds: MoveTo and LineTo. // Returns "flattened" path, transformed by the given matrix. Flattened path consists of only two commands kinds: MoveTo and LineTo.
private NVGPathOutline flattenInternal (scope NVGMatrix* tfm) const { private NVGPathOutline flattenInternal (scope NVGMatrix* tfm) const {
@ -8349,7 +8349,7 @@ public:
public: public:
this (this) { pragma(inline, true); incRef(cast(DataStore*)dsaddr); } this (this) { pragma(inline, true); incRef(cast(DataStore*)dsaddr); }
~this () { pragma(inline, true); decRef(cast(DataStore*)dsaddr); } ~this () { pragma(inline, true); decRef(cast(DataStore*)dsaddr); }
void opAssign() (in auto ref Range a) { void opAssign() (const scope auto ref Range a) {
incRef(cast(DataStore*)a.dsaddr); incRef(cast(DataStore*)a.dsaddr);
decRef(cast(DataStore*)dsaddr); decRef(cast(DataStore*)dsaddr);
dsaddr = a.dsaddr; dsaddr = a.dsaddr;
@ -8637,7 +8637,7 @@ if (isAnyCharType!T)
{ {
if (str.length == 0 || positions.length == 0) return positions[0..0]; if (str.length == 0 || positions.length == 0) return positions[0..0];
usize posnum; usize posnum;
auto len = ctx.textGlyphPositions(x, y, str, (in ref NVGGlyphPosition pos) { auto len = ctx.textGlyphPositions(x, y, str, (const scope ref NVGGlyphPosition pos) {
positions.ptr[posnum++] = pos; positions.ptr[posnum++] = pos;
return (posnum < positions.length); return (posnum < positions.length);
}); });
@ -8713,7 +8713,7 @@ if (isAnyCharType!T)
if (rows.length == 0) return rows; if (rows.length == 0) return rows;
if (rows.length > int.max-1) rows = rows[0..int.max-1]; if (rows.length > int.max-1) rows = rows[0..int.max-1];
int nrow = 0; int nrow = 0;
auto count = ctx.textBreakLines(str, breakRowWidth, (in ref NVGTextRow!T row) { auto count = ctx.textBreakLines(str, breakRowWidth, (const scope ref NVGTextRow!T row) {
rows[nrow++] = row; rows[nrow++] = row;
return (nrow < rows.length); return (nrow < rows.length);
}); });
@ -9908,7 +9908,7 @@ float fons__tt_getGlyphKernAdvance (FONSttFontImpl* font, float size, int glyph1
extern(C) nothrow @trusted @nogc { extern(C) nothrow @trusted @nogc {
static struct OutlinerData { static struct OutlinerData {
@disable this (this); @disable this (this);
void opAssign() (in auto ref OutlinerData a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref OutlinerData a) { static assert(0, "no copies!"); }
NVGContext vg; NVGContext vg;
NVGPathOutline.DataStore* ol; NVGPathOutline.DataStore* ol;
FT_BBox outlineBBox; FT_BBox outlineBBox;
@ -10130,7 +10130,7 @@ static if (is(typeof(STBTT_vcubic))) {
static struct OutlinerData { static struct OutlinerData {
@disable this (this); @disable this (this);
void opAssign() (in auto ref OutlinerData a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref OutlinerData a) { static assert(0, "no copies!"); }
NVGPathOutline.DataStore* ol; NVGPathOutline.DataStore* ol;
nothrow @trusted @nogc: nothrow @trusted @nogc:
static float transx(T) (T v) pure { pragma(inline, true); return cast(float)v; } static float transx(T) (T v) pure { pragma(inline, true); return cast(float)v; }
@ -10296,7 +10296,7 @@ struct FONSfontData {
int rc; int rc;
@disable this (this); // no copies @disable this (this); // no copies
void opAssign() (in auto ref FONSfontData a) { static assert(0, "no copies!"); } void opAssign() (const scope auto ref FONSfontData a) { static assert(0, "no copies!"); }
} }
// won't set rc to 1 // won't set rc to 1
@ -10351,7 +10351,7 @@ struct FONSfont {
int nfallbacks; int nfallbacks;
@disable this (this); @disable this (this);
void opAssign() (in auto ref FONSfont a) { static assert(0, "no copies"); } void opAssign() (const scope auto ref FONSfont a) { static assert(0, "no copies"); }
static uint djbhash (const(void)[] s) pure nothrow @safe @nogc { static uint djbhash (const(void)[] s) pure nothrow @safe @nogc {
uint hash = 5381; uint hash = 5381;
@ -10465,7 +10465,7 @@ struct FONSatlasInternal {
int cnodes; int cnodes;
@disable this (this); @disable this (this);
void opAssign() (in auto ref FONSatlasInternal a) { static assert(0, "no copies"); } void opAssign() (const scope auto ref FONSatlasInternal a) { static assert(0, "no copies"); }
nothrow @trusted @nogc: nothrow @trusted @nogc:
static FONSAtlas create (int w, int h, int nnodes) { static FONSAtlas create (int w, int h, int nnodes) {
@ -10652,7 +10652,7 @@ private:
void delegate (FONSError error, int val) nothrow @trusted @nogc handleError; void delegate (FONSError error, int val) nothrow @trusted @nogc handleError;
@disable this (this); @disable this (this);
void opAssign() (in auto ref FONScontextInternal ctx) { static assert(0, "FONS copying is not allowed"); } void opAssign() (const scope auto ref FONScontextInternal ctx) { static assert(0, "FONS copying is not allowed"); }
private: private:
static bool strequci (const(char)[] s0, const(char)[] s1) pure nothrow @trusted @nogc { static bool strequci (const(char)[] s0, const(char)[] s1) pure nothrow @trusted @nogc {
@ -10975,7 +10975,7 @@ public:
* Note that if you don't plan to rasterize glyphs (i.e. you will use created * Note that if you don't plan to rasterize glyphs (i.e. you will use created
* FontStash only to measure text), you can simply pass `FONSParams.init`). * FontStash only to measure text), you can simply pass `FONSParams.init`).
*/ */
static FONSContext create() (in auto ref FONSParams params) nothrow @trusted @nogc { static FONSContext create() (const scope auto ref FONSParams params) nothrow @trusted @nogc {
import core.stdc.string : memcpy; import core.stdc.string : memcpy;
FONSContext stash = null; FONSContext stash = null;
@ -13392,7 +13392,7 @@ void glnvg__xformToMat3x4 (float[] m3, const(float)[] t) nothrow @trusted @nogc
m3.ptr[11] = 0.0f; m3.ptr[11] = 0.0f;
} }
NVGColor glnvg__premulColor() (in auto ref NVGColor c) nothrow @trusted @nogc { NVGColor glnvg__premulColor() (const scope auto ref NVGColor c) nothrow @trusted @nogc {
//pragma(inline, true); //pragma(inline, true);
NVGColor res = void; NVGColor res = void;
res.r = c.r*c.a; res.r = c.r*c.a;
@ -13860,7 +13860,7 @@ GLNVGblend glnvg__buildBlendFunc (NVGCompositeOperationState op) pure nothrow @t
return res; return res;
} }
void glnvg__blendCompositeOperation() (GLNVGcontext* gl, in auto ref GLNVGblend op) nothrow @trusted @nogc { void glnvg__blendCompositeOperation() (GLNVGcontext* gl, const scope auto ref GLNVGblend op) nothrow @trusted @nogc {
//glBlendFuncSeparate(glnvg_convertBlendFuncFactor(op.srcRGB), glnvg_convertBlendFuncFactor(op.dstRGB), glnvg_convertBlendFuncFactor(op.srcAlpha), glnvg_convertBlendFuncFactor(op.dstAlpha)); //glBlendFuncSeparate(glnvg_convertBlendFuncFactor(op.srcRGB), glnvg_convertBlendFuncFactor(op.dstRGB), glnvg_convertBlendFuncFactor(op.srcAlpha), glnvg_convertBlendFuncFactor(op.dstAlpha));
static if (NANOVG_GL_USE_STATE_FILTER) { static if (NANOVG_GL_USE_STATE_FILTER) {
if (gl.blendFunc.simple == op.simple) { if (gl.blendFunc.simple == op.simple) {
@ -13887,7 +13887,7 @@ void glnvg__blendCompositeOperation() (GLNVGcontext* gl, in auto ref GLNVGblend
} }
} }
void glnvg__renderSetAffine (void* uptr, in ref NVGMatrix mat) nothrow @trusted @nogc { void glnvg__renderSetAffine (void* uptr, const scope ref NVGMatrix mat) nothrow @trusted @nogc {
GLNVGcontext* gl = cast(GLNVGcontext*)uptr; GLNVGcontext* gl = cast(GLNVGcontext*)uptr;
GLNVGcall* call; GLNVGcall* call;
// if last operation was GLNVG_AFFINE, simply replace the matrix // if last operation was GLNVG_AFFINE, simply replace the matrix

4
oauth.d
View File

@ -817,8 +817,8 @@ Variant jsonValueToVariant(JSONValue v) {
extern(C) { extern(C) {
alias int hashid; alias int hashid;
MHASH mhash_hmac_init(hashid, in void*, int, int); MHASH mhash_hmac_init(hashid, const scope void*, int, int);
bool mhash(in void*, in void*, int); bool mhash(const scope void*, const scope void*, int);
int mhash_get_hash_pblock(hashid); int mhash_get_hash_pblock(hashid);
byte* mhash_hmac_end(MHASH); byte* mhash_hmac_end(MHASH);
int mhash_get_block_size(hashid); int mhash_get_block_size(hashid);

4
simpleaudio.d
View File

@ -3291,7 +3291,7 @@ extern(C):
void snd_mixer_selem_id_free(snd_mixer_selem_id_t*); void snd_mixer_selem_id_free(snd_mixer_selem_id_t*);
void snd_mixer_selem_id_set_index(snd_mixer_selem_id_t*, uint); void snd_mixer_selem_id_set_index(snd_mixer_selem_id_t*, uint);
void snd_mixer_selem_id_set_name(snd_mixer_selem_id_t*, const char*); void snd_mixer_selem_id_set_name(snd_mixer_selem_id_t*, const char*);
snd_mixer_elem_t* snd_mixer_find_selem(snd_mixer_t*, in snd_mixer_selem_id_t*); snd_mixer_elem_t* snd_mixer_find_selem(snd_mixer_t*, const scope snd_mixer_selem_id_t*);
// FIXME: the int should be an enum for channel identifier // FIXME: the int should be an enum for channel identifier
int snd_mixer_selem_get_playback_volume(snd_mixer_elem_t*, int, c_long*); int snd_mixer_selem_get_playback_volume(snd_mixer_elem_t*, int, c_long*);
@ -3434,7 +3434,7 @@ extern(Windows):
enum WIM_DATA = WinMMMessage.MM_WIM_DATA; enum WIM_DATA = WinMMMessage.MM_WIM_DATA;
uint mciSendStringA(in char*,char*,uint,void*); uint mciSendStringA(const scope char*,char*,uint,void*);
+/ +/
} }

24
simpledisplay.d
View File

@ -15792,7 +15792,7 @@ extern(C) nothrow @nogc {
int XFree(void*); int XFree(void*);
int XDeleteProperty(Display *display, Window w, Atom property); int XDeleteProperty(Display *display, Window w, Atom property);
int XChangeProperty(Display *display, Window w, Atom property, Atom type, int format, int mode, in void *data, int nelements); int XChangeProperty(Display *display, Window w, Atom property, Atom type, int format, int mode, scope const void *data, int nelements);
int XGetWindowProperty(Display *display, Window w, Atom property, arch_long int XGetWindowProperty(Display *display, Window w, Atom property, arch_long
long_offset, arch_long long_length, Bool del, Atom req_type, Atom long_offset, arch_long long_length, Bool del, Atom req_type, Atom
@ -15845,13 +15845,13 @@ extern(C) nothrow @nogc {
uint XSendEvent(Display* display, Window w, Bool propagate, arch_long event_mask, XEvent* event_send); uint XSendEvent(Display* display, Window w, Bool propagate, arch_long event_mask, XEvent* event_send);
XFontStruct *XLoadQueryFont(Display *display, in char *name); XFontStruct *XLoadQueryFont(Display *display, scope const char *name);
int XFreeFont(Display *display, XFontStruct *font_struct); int XFreeFont(Display *display, XFontStruct *font_struct);
int XSetFont(Display* display, GC gc, Font font); int XSetFont(Display* display, GC gc, Font font);
int XTextWidth(XFontStruct*, in char*, int); int XTextWidth(XFontStruct*, scope const char*, int);
int XSetLineAttributes(Display *display, GC gc, uint line_width, int line_style, int cap_style, int join_style); int XSetLineAttributes(Display *display, GC gc, uint line_width, int line_style, int cap_style, int join_style);
int XSetDashes(Display *display, GC gc, int dash_offset, in byte* dash_list, int n); int XSetDashes(Display *display, GC gc, int dash_offset, scope const byte* dash_list, int n);
Window XCreateSimpleWindow( Window XCreateSimpleWindow(
Display* /* display */, Display* /* display */,
@ -15974,7 +15974,7 @@ extern(C) nothrow @nogc {
// check out Xft too: http://www.keithp.com/~keithp/render/Xft.tutorial // check out Xft too: http://www.keithp.com/~keithp/render/Xft.tutorial
int XDrawString(Display*, Drawable, GC, int, int, in char*, int); int XDrawString(Display*, Drawable, GC, int, int, scope const char*, int);
int XDrawLine(Display*, Drawable, GC, int, int, int, int); int XDrawLine(Display*, Drawable, GC, int, int, int, int);
int XDrawRectangle(Display*, Drawable, GC, int, int, uint, uint); int XDrawRectangle(Display*, Drawable, GC, int, int, uint, uint);
int XDrawArc(Display*, Drawable, GC, int, int, uint, uint, int, int); int XDrawArc(Display*, Drawable, GC, int, int, uint, uint, int, int);
@ -15986,7 +15986,7 @@ extern(C) nothrow @nogc {
XFontSet XCreateFontSet(Display*, const char*, char***, int*, char**); XFontSet XCreateFontSet(Display*, const char*, char***, int*, char**);
void XFreeFontSet(Display*, XFontSet); void XFreeFontSet(Display*, XFontSet);
void Xutf8DrawString(Display*, Drawable, XFontSet, GC, int, int, in char*, int); void Xutf8DrawString(Display*, Drawable, XFontSet, GC, int, int, scope const char*, int);
void Xutf8DrawText(Display*, Drawable, GC, int, int, XmbTextItem*, int); void Xutf8DrawText(Display*, Drawable, GC, int, int, XmbTextItem*, int);
int Xutf8TextExtents(XFontSet font_set, const char *, int num_bytes, XRectangle *overall_ink_return, XRectangle *overall_logical_return); int Xutf8TextExtents(XFontSet font_set, const char *, int num_bytes, XRectangle *overall_ink_return, XRectangle *overall_logical_return);
@ -16121,7 +16121,7 @@ extern(C) nothrow @nogc {
} }
// this requires -lXpm // this requires -lXpm
//int XpmCreatePixmapFromData(Display*, Drawable, in char**, Pixmap*, Pixmap*, void*); // FIXME: void* should be XpmAttributes //int XpmCreatePixmapFromData(Display*, Drawable, scope const char**, Pixmap*, Pixmap*, void*); // FIXME: void* should be XpmAttributes
mixin DynamicLoad!(XLib, "X11", 6, librariesSuccessfullyLoaded) xlib; mixin DynamicLoad!(XLib, "X11", 6, librariesSuccessfullyLoaded) xlib;
@ -16204,8 +16204,8 @@ enum : arch_ulong {
// and the necessary OS functions // and the necessary OS functions
int shmget(int, size_t, int); int shmget(int, size_t, int);
void* shmat(int, in void*, int); void* shmat(int, scope const void*, int);
int shmdt(in void*); int shmdt(scope const void*);
int shmctl (int shmid, int cmd, void* ptr /*struct shmid_ds *buf*/); int shmctl (int shmid, int cmd, void* ptr /*struct shmid_ds *buf*/);
enum IPC_PRIVATE = 0; enum IPC_PRIVATE = 0;
@ -18352,10 +18352,10 @@ extern(System) nothrow @nogc {
void glBindTexture(int, int); void glBindTexture(int, int);
void glTexParameteri(uint, uint, int); void glTexParameteri(uint, uint, int);
void glTexParameterf(uint/*GLenum*/ target, uint/*GLenum*/ pname, float param); void glTexParameterf(uint/*GLenum*/ target, uint/*GLenum*/ pname, float param);
void glTexImage2D(int, int, int, int, int, int, int, int, in void*); void glTexImage2D(int, int, int, int, int, int, int, int, scope const void*);
void glTexSubImage2D(uint/*GLenum*/ target, int level, int xoffset, int yoffset, void glTexSubImage2D(uint/*GLenum*/ target, int level, int xoffset, int yoffset,
/*GLsizei*/int width, /*GLsizei*/int height, /*GLsizei*/int width, /*GLsizei*/int height,
uint/*GLenum*/ format, uint/*GLenum*/ type, in void* pixels); uint/*GLenum*/ format, uint/*GLenum*/ type, scope const void* pixels);
void glTexEnvf(uint/*GLenum*/ target, uint/*GLenum*/ pname, float param); void glTexEnvf(uint/*GLenum*/ target, uint/*GLenum*/ pname, float param);
void glLineWidth(int); void glLineWidth(int);
@ -18488,7 +18488,7 @@ extern(System) nothrow @nogc {
void glTextureSubImage2D(uint texture, int level, int xoffset, int yoffset, void glTextureSubImage2D(uint texture, int level, int xoffset, int yoffset,
/*GLsizei*/int width, /*GLsizei*/int height, /*GLsizei*/int width, /*GLsizei*/int height,
uint/*GLenum*/ format, uint/*GLenum*/ type, in void* pixels); uint/*GLenum*/ format, uint/*GLenum*/ type, scope const void* pixels);
} }
interface GLU { interface GLU {

2
ttf.d
View File

@ -4382,7 +4382,7 @@ public void stbtt_GetPackedQuad(const(stbtt_packedchar)* chardata, int pw, int p
T STBTT_min(T) (in T a, in T b) pure { pragma(inline, true); return (a < b ? a : b); } T STBTT_min(T) (in T a, in T b) pure { pragma(inline, true); return (a < b ? a : b); }
T STBTT_max(T) (in T a, in T b) pure { pragma(inline, true); return (a < b ? b : a); } T STBTT_max(T) (in T a, in T b) pure { pragma(inline, true); return (a < b ? b : a); }
private int stbtt__ray_intersect_bezier(in ref float[2] orig, in ref float[2] ray, in ref float[2] q0, in ref float[2] q1, in ref float[2] q2, ref float[2][2] hits) private int stbtt__ray_intersect_bezier(const scope ref float[2] orig, const scope ref float[2] ray, const scope ref float[2] q0, const scope ref float[2] q1, const scope ref float[2] q2, ref float[2][2] hits)
{ {
float q0perp = q0[1]*ray[0] - q0[0]*ray[1]; float q0perp = q0[1]*ray[0] - q0[0]*ray[1];
float q1perp = q1[1]*ray[0] - q1[0]*ray[1]; float q1perp = q1[1]*ray[0] - q1[0]*ray[1];

6
vorbis.d
View File

@ -67,7 +67,7 @@ version(Windows)
nothrow /*@trusted*/: nothrow /*@trusted*/:
@nogc { // code block, as c macro helper is not @nogc; yet it's CTFE-only @nogc { // code block, as c macro helper is not @nogc; yet it's CTFE-only
// import it here, as druntime has no `@nogc` on it (for a reason) // import it here, as druntime has no `@nogc` on it (for a reason)
private extern(C) void qsort (void* base, size_t nmemb, size_t size, int function(in void*, in void*) compar); private extern(C) void qsort (void* base, size_t nmemb, size_t size, int function(const scope void*, const scope void*) compar);
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -850,7 +850,7 @@ private void compute_accelerated_huffman (Codebook* c) {
} }
} }
extern(C) int uint32_compare (const void* p, const void* q) { extern(C) int uint32_compare (const scope void* p, const scope void* q) {
uint x = *cast(uint*)p; uint x = *cast(uint*)p;
uint y = *cast(uint*)q; uint y = *cast(uint*)q;
return (x < y ? -1 : x > y); return (x < y ? -1 : x > y);
@ -992,7 +992,7 @@ struct Point {
ushort x, y; ushort x, y;
} }
extern(C) int point_compare (const void *p, const void *q) { extern(C) int point_compare (const scope void *p, const scope void *q) {
auto a = cast(const(Point)*)p; auto a = cast(const(Point)*)p;
auto b = cast(const(Point)*)q; auto b = cast(const(Point)*)q;
return (a.x < b.x ? -1 : a.x > b.x); return (a.x < b.x ? -1 : a.x > b.x);