summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DevIL/src-IL/src/il_dds.cpp2
-rw-r--r--DevIL/src-IL/src/il_pnm.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/DevIL/src-IL/src/il_dds.cpp b/DevIL/src-IL/src/il_dds.cpp
index 46e64344..a1df617b 100644
--- a/DevIL/src-IL/src/il_dds.cpp
+++ b/DevIL/src-IL/src/il_dds.cpp
@@ -632,7 +632,7 @@ ILuint DecodePixelFormat(ILuint *CompFormat)
//--------------------------------------------------------------------------------------
// Return the BPP for a particular format.
//--------------------------------------------------------------------------------------
-static size_t BitsPerPixel(_In_ DXGI_FORMAT fmt)
+static size_t BitsPerPixel(DXGI_FORMAT fmt)
{
switch (fmt)
{
diff --git a/DevIL/src-IL/src/il_pnm.cpp b/DevIL/src-IL/src/il_pnm.cpp
index 2b057035..7809c16e 100644
--- a/DevIL/src-IL/src/il_pnm.cpp
+++ b/DevIL/src-IL/src/il_pnm.cpp
@@ -467,7 +467,7 @@ ILboolean ilReadPam()
else if (!strncmp(TempStr.c_str(), "MAXVAL", 6))
Info.MaxColour = atoi((const char*)SmallBuff);
else if (!strncmp(TempStr.c_str(), "TUPLTYPE", 8))
- Info.TuplType = DecodeTupleType(string((char*)SmallBuff));
+ Info.TuplType = DecodeTupleType(TempStr);
}
//@TODO: Handle other max colors and tuple types