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

ketmar fix

This commit is contained in:
Adam D. Ruppe 2018-02-26 18:19:18 -05:00
parent 53e7bbb89d
commit 9235f38340
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
image.d
View File

@ -215,7 +215,16 @@ public MemoryImage loadImageFromFile(T:const(char)[]) (T filename) {
final switch (guessImageFormatFromExtension(filename)) { final switch (guessImageFormatFromExtension(filename)) {
case ImageFileFormat.Unknown: case ImageFileFormat.Unknown:
//throw new Exception("cannot determine file format from extension"); //throw new Exception("cannot determine file format from extension");
static if (ArsdImageHasIVVFS) auto fl = VFile(filename); else { import std.stdio; auto fl = File(filename); } static if (ArsdImageHasIVVFS) {
auto fl = VFile(filename);
} else {
import std.stdio;
static if (is(T == string)) {
auto fl = File(filename);
} else {
auto fl = File(filename.idup);
}
}
auto fsz = fl.size-fl.tell; auto fsz = fl.size-fl.tell;
if (fsz < 4) throw new Exception("cannot determine file format"); if (fsz < 4) throw new Exception("cannot determine file format");
if (fsz > int.max/8) throw new Exception("image data too big"); if (fsz > int.max/8) throw new Exception("image data too big");
@ -230,7 +239,16 @@ public MemoryImage loadImageFromFile(T:const(char)[]) (T filename) {
case ImageFileFormat.Tga: return loadTga(filename); case ImageFileFormat.Tga: return loadTga(filename);
case ImageFileFormat.Pcx: return loadPcx(filename); case ImageFileFormat.Pcx: return loadPcx(filename);
case ImageFileFormat.Dds: case ImageFileFormat.Dds:
static if (ArsdImageHasIVVFS) auto fl = VFile(filename); else { import std.stdio; auto fl = File(filename); } static if (ArsdImageHasIVVFS) {
auto fl = VFile(filename);
} else {
import std.stdio;
static if (is(T == string)) {
auto fl = File(filename);
} else {
auto fl = File(filename.idup);
}
}
return ddsLoadFromFile(fl); return ddsLoadFromFile(fl);
} }
} }

2
targa.d
View File

@ -470,7 +470,7 @@ void rawWrite(ST, T) (auto ref ST st, in T[] buf) if (isLowLevelStreamW!ST) {
} }
// read exact size or throw error // read exact size or throw error
T[] rawReadExact(ST, T) (auto ref ST st, T[] buf) if (isReadableStream!ST && !is(T == const) && !is(T == immutable)) { package(arsd) T[] rawReadExact(ST, T) (auto ref ST st, T[] buf) if (isReadableStream!ST && !is(T == const) && !is(T == immutable)) {
if (buf.length == 0) return buf; if (buf.length == 0) return buf;
auto left = buf.length*T.sizeof; auto left = buf.length*T.sizeof;
auto dp = cast(ubyte*)buf.ptr; auto dp = cast(ubyte*)buf.ptr;