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

improve png chunk stype

This commit is contained in:
John Colvin 2018-03-27 12:49:16 +01:00
parent 26da315d06
commit c3c78632b2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
png.d
View File

@ -356,7 +356,7 @@ struct PNG {
Chunk* getChunk(string what) { Chunk* getChunk(string what) {
foreach(ref c; chunks) { foreach(ref c; chunks) {
if(cast(string) c.type == what) if(c.stype == what)
return &c; return &c;
} }
throw new Exception("no such chunk " ~ what); throw new Exception("no such chunk " ~ what);
@ -364,7 +364,7 @@ struct PNG {
Chunk* getChunkNullable(string what) { Chunk* getChunkNullable(string what) {
foreach(ref c; chunks) { foreach(ref c; chunks) {
if(cast(string) c.type == what) if(c.stype == what)
return &c; return &c;
} }
return null; return null;
@ -384,7 +384,7 @@ struct PNG {
chunks[idx] = *chk; chunks[idx] = *chk;
return true; return true;
} }
if (cast(string)cc.type == "IDAT") { if (cc.stype == "IDAT") {
// ok, insert it; and don't use phobos // ok, insert it; and don't use phobos
chunks.length += 1; chunks.length += 1;
foreach_reverse (immutable c; idx+1..chunks.length) chunks.ptr[c] = chunks.ptr[c-1]; foreach_reverse (immutable c; idx+1..chunks.length) chunks.ptr[c] = chunks.ptr[c-1];
@ -669,7 +669,7 @@ ubyte[] getDatastream(PNG* p) {
ubyte[] compressed; ubyte[] compressed;
foreach(c; p.chunks) { foreach(c; p.chunks) {
if(cast(string) c.type != "IDAT") if(c.stype != "IDAT")
continue; continue;
compressed ~= c.payload; compressed ~= c.payload;
} }
@ -1576,8 +1576,8 @@ struct Chunk {
uint checksum; uint checksum;
/// returns the type as a string for easier comparison with literals /// returns the type as a string for easier comparison with literals
string stype() const { const(char)[] stype() return const {
return cast(string) type; return cast(const(char)[]) type;
} }
static Chunk* create(string type, ubyte[] payload) static Chunk* create(string type, ubyte[] payload)