mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 05:46:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium

Browse Source
This commit is contained in:
Person
2019-05-16 20:56:15 -07:00
parent d8b3dd40d6 1d9e3e1ade
commit 8614ae86a9
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/EmberCommon/EmberCommonPch.h
View File

@ -67,9 +67,8 @@
#include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfStringAttribute.h>
#include <OpenEXR/half.h>
#undef FALSE
#undef TRUE
#include <mach-o/dyld.h>
#define ENUM_DYLD_BOOL
#include <mach-o/dyld.h>
#else
#include <ImfRgbaFile.h>
#include <ImfStringAttribute.h>

2
Source/EmberCommon/JpegUtils.h
View File

@ -59,7 +59,7 @@ static bool WriteJpeg(const char* filename, byte* image, size_t width, size_t he
info.image_width = JDIMENSION(width);
info.image_height = JDIMENSION(height);
jpeg_set_defaults(&info);
#ifdef _WIN32
#if defined(_WIN32) || defined(__APPLE__)
jpeg_set_quality(&info, quality, static_cast<boolean>(TRUE));
jpeg_start_compress(&info, static_cast<boolean>(TRUE));
//Win32:TRUE is defined in MSVC2013\Windows Kits\8.1\Include\shared\minwindef.h:"#define TRUE 1"