From 9235f38340f68e35d8fce8b6455f5ee4b2fa00dd Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Mon, 26 Feb 2018 18:19:18 -0500
Subject: [PATCH] ketmar fix

---
 image.d | 22 ++++++++++++++++++++--
 targa.d |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/image.d b/image.d
index 83279fc..22989d0 100644
--- a/image.d
+++ b/image.d
@@ -215,7 +215,16 @@ public MemoryImage loadImageFromFile(T:const(char)[]) (T filename) {
     final switch (guessImageFormatFromExtension(filename)) {
       case ImageFileFormat.Unknown:
         //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;
         if (fsz < 4) throw new Exception("cannot determine file format");
         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.Pcx: return loadPcx(filename);
       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);
     }
   }
diff --git a/targa.d b/targa.d
index 61e440f..7dcc3b9 100644
--- a/targa.d
+++ b/targa.d
@@ -470,7 +470,7 @@ void rawWrite(ST, T) (auto ref ST st, in T[] buf) if (isLowLevelStreamW!ST) {
 }
 
 // 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;
   auto left = buf.length*T.sizeof;
   auto dp = cast(ubyte*)buf.ptr;