From 0f674b6ee1d1580a51f0c8880475a72d29a49340 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 2 Jan 2016 20:40:40 -0800 Subject: [PATCH] Updated to version 2.0.1 --- CHANGES.txt | 16 ++++++++++++++++ SDL2_image.spec | 2 +- SDL_image.h | 2 +- VisualC/Version.rc | 8 ++++---- VisualCE/Version.rc | 8 ++++---- Xcode-iOS/SDL_image.xcodeproj/project.pbxproj | 4 ++-- Xcode/Info-Framework.plist | 4 ++-- Xcode/SDL_image.xcodeproj/project.pbxproj | 4 ++-- configure | 6 +++--- configure.in | 6 +++--- version.rc | 8 ++++---- 11 files changed, 42 insertions(+), 26 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index cc174e26..4dec65d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,19 @@ +2.0.1: +Jeffrey Carpenter - Sat Nov 29 12:06:05 2014 + * Fixed image colorspace issue on iOS and Mac OS X +Sam Lantinga - Sun Jun 15 17:33:46 2014 + * Fixed support for transparency in XPM files +Davide Coppola - Thu Apr 17 17:30:12 2014 + * Fixed building JPEG support on Android +David Ludwig - Tue Apr 01 19:40:35 2014 + * Added support for building for Windows RT and Windows Phone +Timur - Wed Dec 11 21:24:36 2013 + * Fixed memory leak in webp image loading +Patrice Mandin - Thu Nov 07 19:15:28 2013 + * Fixed loading BMP files with large BITMAPINFOHEADER structures +Sam Lantinga - Fri Oct 11 21:54:20 2013 + * Fixed building with libpng 1.4 + 2.0.0: Sam Lantinga - Sun Jun 2 22:25:31 PDT 2013 * Added PNG save support based on miniz.c by Rich Geldreich diff --git a/SDL2_image.spec b/SDL2_image.spec index 08289d0b..bfa8a2e4 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -1,5 +1,5 @@ %define name SDL2_image -%define version 2.0.0 +%define version 2.0.1 %define release 1 Summary: Simple DirectMedia Layer - Sample Image Loading Library diff --git a/SDL_image.h b/SDL_image.h index 6dcf3f3e..f6544830 100644 --- a/SDL_image.h +++ b/SDL_image.h @@ -37,7 +37,7 @@ extern "C" { */ #define SDL_IMAGE_MAJOR_VERSION 2 #define SDL_IMAGE_MINOR_VERSION 0 -#define SDL_IMAGE_PATCHLEVEL 0 +#define SDL_IMAGE_PATCHLEVEL 1 /* This macro can be used to fill a version structure with the compile-time * version of the SDL_image library. diff --git a/VisualC/Version.rc b/VisualC/Version.rc index f6a1a605..2fd48bf6 100755 --- a/VisualC/Version.rc +++ b/VisualC/Version.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,0,1,0 + PRODUCTVERSION 2,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "2, 0, 0, 0\0" + VALUE "FileVersion", "2, 0, 1, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright © 2016 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 0, 0\0" + VALUE "ProductVersion", "2, 0, 1, 0\0" END END BLOCK "VarFileInfo" diff --git a/VisualCE/Version.rc b/VisualCE/Version.rc index 29188d6b..da95f9f2 100644 --- a/VisualCE/Version.rc +++ b/VisualCE/Version.rc @@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,11,0 - PRODUCTVERSION 1,2,11,0 + FILEVERSION 2,0,1,0 + PRODUCTVERSION 2,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,12 +47,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "1, 2, 11, 0\0" + VALUE "FileVersion", "2, 0, 1, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright © 2016 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "1, 2, 11, 0\0" + VALUE "ProductVersion", "2, 0, 1, 0\0" END END BLOCK "VarFileInfo" diff --git a/Xcode-iOS/SDL_image.xcodeproj/project.pbxproj b/Xcode-iOS/SDL_image.xcodeproj/project.pbxproj index e803c07c..b454093a 100755 --- a/Xcode-iOS/SDL_image.xcodeproj/project.pbxproj +++ b/Xcode-iOS/SDL_image.xcodeproj/project.pbxproj @@ -244,7 +244,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 1.1.0; GCC_ENABLE_FIX_AND_CONTINUE = YES; IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_STYLE = STATIC; @@ -283,7 +283,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 1.1.0; GCC_ENABLE_FIX_AND_CONTINUE = NO; IPHONEOS_DEPLOYMENT_TARGET = 5.1; LIBRARY_STYLE = STATIC; diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist index 9332f7f0..e848889e 100644 --- a/Xcode/Info-Framework.plist +++ b/Xcode/Info-Framework.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.0 + 2.0.1 CFBundleVersion - 2.0.0 + 2.0.1 diff --git a/Xcode/SDL_image.xcodeproj/project.pbxproj b/Xcode/SDL_image.xcodeproj/project.pbxproj index 27abe6c3..e919a2a5 100755 --- a/Xcode/SDL_image.xcodeproj/project.pbxproj +++ b/Xcode/SDL_image.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 1.1.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Frameworks\"", @@ -625,7 +625,7 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 1.1.0; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Frameworks\"", diff --git a/configure b/configure index d9dbd78d..eec869e8 100755 --- a/configure +++ b/configure @@ -2473,9 +2473,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu MAJOR_VERSION=2 MINOR_VERSION=0 -MICRO_VERSION=0 -INTERFACE_AGE=0 -BINARY_AGE=0 +MICRO_VERSION=1 +INTERFACE_AGE=1 +BINARY_AGE=1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION diff --git a/configure.in b/configure.in index dc94da21..b03c5e4d 100644 --- a/configure.in +++ b/configure.in @@ -13,9 +13,9 @@ dnl Set various version strings - taken gratefully from the GTk sources MAJOR_VERSION=2 MINOR_VERSION=0 -MICRO_VERSION=0 -INTERFACE_AGE=0 -BINARY_AGE=0 +MICRO_VERSION=1 +INTERFACE_AGE=1 +BINARY_AGE=1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION AC_SUBST(MAJOR_VERSION) diff --git a/version.rc b/version.rc index f5f9e609..25e836b7 100644 --- a/version.rc +++ b/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,0,1,0 + PRODUCTVERSION 2,0,1,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "2, 0, 0, 0\0" + VALUE "FileVersion", "2, 0, 1, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright © 2016 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 0, 0, 0\0" + VALUE "ProductVersion", "2, 0, 1, 0\0" END END BLOCK "VarFileInfo"