From 4f3a9ac4475cf7973b68dbaa6f3b94b44417ed74 Mon Sep 17 00:00:00 2001 From: abma Date: Tue, 24 Jan 2017 01:03:41 +0100 Subject: remove compile errors: _In_ macro: http://stackoverflow.com/questions/11457328/what-is-in-in-c invalid/duplicate conversation --- DevIL/src-IL/src/il_dds.cpp | 2 +- DevIL/src-IL/src/il_pnm.cpp | 2 +- 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 -- cgit v1.2.1