From c757376e29867ff6c5cb5a6ddf1d515a53cdcbba Mon Sep 17 00:00:00 2001 From: Kim Johannsen Date: Fri, 21 Feb 2014 23:51:24 +0100 Subject: [PATCH 1/2] - Added algorithm header for MSVC2013 compatability - Changed "WIN32" to "_WIN32", as the "WIN32" define is mingw only. --- LibRawLite/internal/defines.h | 2 +- LibRawLite/libraw/libraw_alloc.h | 2 +- LibRawLite/libraw/libraw_types.h | 2 +- LibRawLite/src/libraw_cxx.cpp | 2 +- OpenEXR/IlmImf/ImfMisc.h | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/LibRawLite/internal/defines.h b/LibRawLite/internal/defines.h index c48bb32..c327adf 100755 --- a/LibRawLite/internal/defines.h +++ b/LibRawLite/internal/defines.h @@ -44,7 +44,7 @@ #ifdef __CYGWIN__ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include #include #pragma comment(lib, "ws2_32.lib") diff --git a/LibRawLite/libraw/libraw_alloc.h b/LibRawLite/libraw/libraw_alloc.h index 1d9877b..2f1801a 100755 --- a/LibRawLite/libraw/libraw_alloc.h +++ b/LibRawLite/libraw/libraw_alloc.h @@ -25,7 +25,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #define bzero(p,sz) memset(p,0,sz) #endif diff --git a/LibRawLite/libraw/libraw_types.h b/LibRawLite/libraw/libraw_types.h index dafe497..32c53e2 100755 --- a/LibRawLite/libraw/libraw_types.h +++ b/LibRawLite/libraw/libraw_types.h @@ -23,7 +23,7 @@ #ifndef _LIBRAW_TYPES_H #define _LIBRAW_TYPES_H -#ifndef WIN32 +#ifndef _WIN32 #include #endif #include diff --git a/LibRawLite/src/libraw_cxx.cpp b/LibRawLite/src/libraw_cxx.cpp index fc3547b..2b606df 100755 --- a/LibRawLite/src/libraw_cxx.cpp +++ b/LibRawLite/src/libraw_cxx.cpp @@ -23,7 +23,7 @@ #include #include #include -#ifndef WIN32 +#ifndef _WIN32 #include #else #include diff --git a/OpenEXR/IlmImf/ImfMisc.h b/OpenEXR/IlmImf/ImfMisc.h index 85718f4..5d28917 100755 --- a/OpenEXR/IlmImf/ImfMisc.h +++ b/OpenEXR/IlmImf/ImfMisc.h @@ -45,6 +45,7 @@ #include #include +#include #include namespace Imf { From 0fc683e2a32d75517e3495702228076cb57be08f Mon Sep 17 00:00:00 2001 From: Kim Johannsen Date: Thu, 24 Sep 2015 15:44:11 +0200 Subject: [PATCH 2/2] Added space between string and macro to add c++11 compatability. --- LibRawLite/internal/dcraw_common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LibRawLite/internal/dcraw_common.cpp b/LibRawLite/internal/dcraw_common.cpp index 2e5b82c..b8fbd72 100755 --- a/LibRawLite/internal/dcraw_common.cpp +++ b/LibRawLite/internal/dcraw_common.cpp @@ -7354,7 +7354,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) strncpy (th->t_desc, desc, 512); strncpy (th->t_make, make, 64); strncpy (th->t_model, model, 64); - strcpy (th->soft, "dcraw v"VERSION); + strcpy (th->soft, "dcraw v" VERSION); t = gmtime (×tamp); sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d", t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);