Skip to content

- Added algorithm header for MSVC2013 compatability #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qimmer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

- Added algorithm header for MSVC2013 compatability #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c757376
- Added algorithm header for MSVC2013 compatability
qimmer Feb 21, 2014
0fc683e
Added space between string and macro to add c++11 compatability.
qimmer Sep 24, 2015
b1c28bc
Merge branch 'master' of https://github.com/qimmer/FreeImage
qimmer Sep 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LibRawLite/internal/dcraw_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (&timestamp);
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);
Expand Down
2 changes: 1 addition & 1 deletion LibRawLite/internal/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#ifdef __CYGWIN__
#include <io.h>
#endif
#ifdef WIN32
#ifdef _WIN32
#include <sys/utime.h>
#include <winsock2.h>
#pragma comment(lib, "ws2_32.lib")
Expand Down
2 changes: 1 addition & 1 deletion LibRawLite/libraw/libraw_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <stdlib.h>
#include <string.h>
#ifdef WIN32
#ifdef _WIN32
#define bzero(p,sz) memset(p,0,sz)
#endif

Expand Down
2 changes: 1 addition & 1 deletion LibRawLite/libraw/libraw_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef _LIBRAW_TYPES_H
#define _LIBRAW_TYPES_H

#ifndef WIN32
#ifndef _WIN32
#include <sys/time.h>
#endif
#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion LibRawLite/src/libraw_cxx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <errno.h>
#include <float.h>
#include <math.h>
#ifndef WIN32
#ifndef _WIN32
#include <netinet/in.h>
#else
#include <winsock2.h>
Expand Down
1 change: 1 addition & 0 deletions OpenEXR/IlmImf/ImfMisc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

#include <ImfPixelType.h>
#include <vector>
#include <algorithm>
#include <ImfCompressor.h>

namespace Imf {
Expand Down