Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated to version 2.0.4
  • Loading branch information
slouken committed Oct 26, 2018
1 parent 578a864 commit 38a2806
Show file tree
Hide file tree
Showing 13 changed files with 368 additions and 303 deletions.
6 changes: 6 additions & 0 deletions CHANGES.txt
@@ -1,3 +1,9 @@
2.0.4:
Michał Janiszewski - Fri Sept 28 22:00:26 PST 2018
* Fixed memory issues in the XCF loader
Ryan Gordon - Wed Sept 26 14:58:31 PST 2018
* Fixed a number of security issues, including TALOS-2018-0645

2.0.3:
Ryan Gordon - Sun Jan 28 21:28:16 PST 2018
* Fixed a number of security issues:
Expand Down
197 changes: 131 additions & 66 deletions Makefile.in

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SDL2_image.spec
@@ -1,5 +1,5 @@
%define name SDL2_image
%define version 2.0.3
%define version 2.0.4
%define release 1

Summary: Simple DirectMedia Layer - Sample Image Loading Library
Expand Down
2 changes: 1 addition & 1 deletion SDL_image.h
Expand Up @@ -37,7 +37,7 @@ extern "C" {
*/
#define SDL_IMAGE_MAJOR_VERSION 2
#define SDL_IMAGE_MINOR_VERSION 0
#define SDL_IMAGE_PATCHLEVEL 3
#define SDL_IMAGE_PATCHLEVEL 4

/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_image library.
Expand Down
8 changes: 4 additions & 4 deletions VisualC/Version.rc
Expand Up @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,3,0
PRODUCTVERSION 2,0,3,0
FILEVERSION 2,0,4,0
PRODUCTVERSION 2,0,4,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_image\0"
VALUE "FileVersion", "2, 0, 3, 0\0"
VALUE "FileVersion", "2, 0, 4, 0\0"
VALUE "InternalName", "SDL_image\0"
VALUE "LegalCopyright", "Copyright � 2018 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_image.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 0, 3, 0\0"
VALUE "ProductVersion", "2, 0, 4, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions VisualCE/Version.rc
Expand Up @@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,1,0
PRODUCTVERSION 2,0,1,0
FILEVERSION 2,0,4,0
PRODUCTVERSION 2,0,4,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -47,12 +47,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_image\0"
VALUE "FileVersion", "2, 0, 1, 0\0"
VALUE "FileVersion", "2, 0, 4, 0\0"
VALUE "InternalName", "SDL_image\0"
VALUE "LegalCopyright", "Copyright � 2018 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_image.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
VALUE "ProductVersion", "2, 0, 1, 0\0"
VALUE "ProductVersion", "2, 0, 4, 0\0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions Xcode/Info-Framework.plist
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.3</string>
<string>2.0.4</string>
<key>CFBundleVersion</key>
<string>2.0.3</string>
<string>2.0.4</string>
</dict>
</plist>
8 changes: 4 additions & 4 deletions Xcode/SDL_image.xcodeproj/project.pbxproj
Expand Up @@ -509,8 +509,8 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.0;
DYLIB_COMPATIBILITY_VERSION = 3.0.0;
DYLIB_CURRENT_VERSION = 3.2.0;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
Expand Down Expand Up @@ -634,8 +634,8 @@
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 3.1.0;
DYLIB_COMPATIBILITY_VERSION = 3.0.0;
DYLIB_CURRENT_VERSION = 3.2.0;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
Expand Down

0 comments on commit 38a2806

Please sign in to comment.