archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updates stb_image from 1.33 to 2.10

Browse source 
Updates stb_image from 1.33 to 2.10 which deprecates stb_image.c and
uses only stb_image.h
This commit is contained in:
AnnieL 2016-03-15 19:30:23 +00:00
parent 454fbce4c6
commit 8cded28c45
5 changed files with 6549 additions and 4590 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp
View file

@ -4,10 +4,8 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/Modules.h"
extern "C" // STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
{
#include "stblib/stb_image.h" #include "stblib/stb_image.h"
}
#include "Emu/FS/VFS.h" #include "Emu/FS/VFS.h"
#include "Emu/FS/vfsFileBase.h" #include "Emu/FS/vfsFileBase.h"

4
rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp
View file

@ -4,10 +4,8 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/Modules.h"
extern "C" // STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp
{
#include "stblib/stb_image.h" #include "stblib/stb_image.h"
}
#include "Emu/FS/VFS.h" #include "Emu/FS/VFS.h"
#include "Emu/FS/vfsFileBase.h" #include "Emu/FS/vfsFileBase.h"

9
rpcs3/stb_image.cpp
View file

@ -1,9 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
// Defines STB_IMAGE_IMPLEMENTATION *once* before including stb_image.h (as said in stb_image.h's comments)
extern "C" #define STB_IMAGE_IMPLEMENTATION
{
#pragma warning(push, 0)
#include "stblib/stb_image.h" #include "stblib/stb_image.h"
#include "stblib/stb_image.c"
#pragma warning(pop)
}

4401
stblib/stb_image.c
View file

File diff suppressed because it is too large Load diff

6701
stblib/stb_image.h
View file

File diff suppressed because it is too large Load diff