Skip to content

Commit

Permalink
Updated to the latest versions of the image loading libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Oct 22, 2017
1 parent 15b5e2e commit 740121a
Show file tree
Hide file tree
Showing 1,523 changed files with 3,073 additions and 620,893 deletions.
8 changes: 4 additions & 4 deletions Android.mk
View file
Expand Up @@ -7,19 +7,19 @@ LOCAL_MODULE := SDL2_image
# Enable this if you want to support loading JPEG images
# The library path should be a relative path to this directory.
SUPPORT_JPG ?= true
JPG_LIBRARY_PATH := external/jpeg-9
JPG_LIBRARY_PATH := external/jpeg-9b

# Enable this if you want to support loading PNG images
# The library path should be a relative path to this directory.
SUPPORT_PNG ?= true
PNG_LIBRARY_PATH := external/libpng-1.6.2
PNG_LIBRARY_PATH := external/libpng-1.6.32

# Enable this if you want to support loading WebP images
# The library path should be a relative path to this directory.
#
# IMPORTANT: In order to enable this must have a symlink in your jni directory to external/libwebp-0.3.0.
# IMPORTANT: In order to enable this must have a symlink in your jni directory to external/libwebp-0.6.0.
SUPPORT_WEBP ?= false
WEBP_LIBRARY_PATH := external/libwebp-0.3.0
WEBP_LIBRARY_PATH := external/libwebp-0.6.0


LOCAL_C_INCLUDES := $(LOCAL_PATH)
Expand Down
6 changes: 3 additions & 3 deletions IMG_jpg.c
View file
Expand Up @@ -554,7 +554,7 @@ static boolean empty_output_buffer(j_compress_ptr cinfo)
dest->pub.next_output_byte = dest->buffer;
dest->pub.free_in_buffer = OUTPUT_BUFFER_SIZE;

return SDL_TRUE;
return TRUE;
}

static void term_destination(j_compress_ptr cinfo)
Expand Down Expand Up @@ -629,8 +629,8 @@ static int IMG_SaveJPG_RW_jpeglib(SDL_Surface *surface, SDL_RWops *dst, int free
cinfo.input_components = 3;

lib.jpeg_set_defaults(&cinfo);
lib.jpeg_set_quality(&cinfo, quality, SDL_TRUE);
lib.jpeg_start_compress(&cinfo, SDL_TRUE);
lib.jpeg_set_quality(&cinfo, quality, TRUE);
lib.jpeg_start_compress(&cinfo, TRUE);

while (cinfo.next_scanline < cinfo.image_height) {
int offset = cinfo.next_scanline * surface->pitch;
Expand Down
10 changes: 5 additions & 5 deletions VisualC-WinRT/WinPhone80_VS2012/SDL_image-WinPhone80.vcxproj
View file
Expand Up @@ -83,7 +83,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9;..\..\external\libwebp-0.3.0\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.32;..\..\external\jpeg-9b;..\..\external\libwebp-0.6.0\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -99,7 +99,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9;..\..\external\libwebp-0.3.0\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.32;..\..\external\jpeg-9b;..\..\external\libwebp-0.6.0\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -115,7 +115,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9;..\..\external\libwebp-0.3.0\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.32;..\..\external\jpeg-9b;..\..\external\libwebp-0.6.0\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -131,7 +131,7 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.2;..\..\external\jpeg-9;..\..\external\libwebp-0.3.0\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\SDL\include;..\..\external\libpng-1.6.32;..\..\external\jpeg-9b;..\..\external\libwebp-0.6.0\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -184,4 +184,4 @@
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
118 changes: 59 additions & 59 deletions VisualC-WinRT/WinPhone80_VS2012/jpeg-WinPhone80.vcxproj
View file
Expand Up @@ -153,69 +153,69 @@
<None Include="..\VisualC-WinRT\jpeg.def" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\external\jpeg-9\jaricom.c" />
<ClCompile Include="..\..\external\jpeg-9\jcapimin.c" />
<ClCompile Include="..\..\external\jpeg-9\jcapistd.c" />
<ClCompile Include="..\..\external\jpeg-9\jcarith.c" />
<ClCompile Include="..\..\external\jpeg-9\jccoefct.c" />
<ClCompile Include="..\..\external\jpeg-9\jccolor.c" />
<ClCompile Include="..\..\external\jpeg-9\jcdctmgr.c" />
<ClCompile Include="..\..\external\jpeg-9\jchuff.c" />
<ClCompile Include="..\..\external\jpeg-9\jcinit.c" />
<ClCompile Include="..\..\external\jpeg-9\jcmainct.c" />
<ClCompile Include="..\..\external\jpeg-9\jcmarker.c" />
<ClCompile Include="..\..\external\jpeg-9\jcmaster.c" />
<ClCompile Include="..\..\external\jpeg-9\jcomapi.c" />
<ClCompile Include="..\..\external\jpeg-9\jcparam.c" />
<ClCompile Include="..\..\external\jpeg-9\jcprepct.c" />
<ClCompile Include="..\..\external\jpeg-9\jcsample.c" />
<ClCompile Include="..\..\external\jpeg-9\jctrans.c" />
<ClCompile Include="..\..\external\jpeg-9\jdapimin.c" />
<ClCompile Include="..\..\external\jpeg-9\jdapistd.c" />
<ClCompile Include="..\..\external\jpeg-9\jdarith.c" />
<ClCompile Include="..\..\external\jpeg-9\jdatadst.c" />
<ClCompile Include="..\..\external\jpeg-9\jdatasrc.c" />
<ClCompile Include="..\..\external\jpeg-9\jdcoefct.c" />
<ClCompile Include="..\..\external\jpeg-9\jdcolor.c" />
<ClCompile Include="..\..\external\jpeg-9\jddctmgr.c" />
<ClCompile Include="..\..\external\jpeg-9\jdhuff.c" />
<ClCompile Include="..\..\external\jpeg-9\jdinput.c" />
<ClCompile Include="..\..\external\jpeg-9\jdmainct.c" />
<ClCompile Include="..\..\external\jpeg-9\jdmarker.c" />
<ClCompile Include="..\..\external\jpeg-9\jdmaster.c" />
<ClCompile Include="..\..\external\jpeg-9\jdmerge.c" />
<ClCompile Include="..\..\external\jpeg-9\jdpostct.c" />
<ClCompile Include="..\..\external\jpeg-9\jdsample.c" />
<ClCompile Include="..\..\external\jpeg-9\jdtrans.c" />
<ClCompile Include="..\..\external\jpeg-9\jerror.c" />
<ClCompile Include="..\..\external\jpeg-9\jfdctflt.c" />
<ClCompile Include="..\..\external\jpeg-9\jfdctfst.c" />
<ClCompile Include="..\..\external\jpeg-9\jfdctint.c" />
<ClCompile Include="..\..\external\jpeg-9\jidctflt.c" />
<ClCompile Include="..\..\external\jpeg-9\jidctfst.c" />
<ClCompile Include="..\..\external\jpeg-9\jidctint.c" />
<ClCompile Include="..\..\external\jpeg-9\jmemansi.c" />
<ClCompile Include="..\..\external\jpeg-9\jmemmgr.c" />
<ClCompile Include="..\..\external\jpeg-9\jquant1.c" />
<ClCompile Include="..\..\external\jpeg-9\jquant2.c" />
<ClCompile Include="..\..\external\jpeg-9\jutils.c" />
<ClCompile Include="..\..\external\jpeg-9b\jaricom.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcapimin.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcapistd.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcarith.c" />
<ClCompile Include="..\..\external\jpeg-9b\jccoefct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jccolor.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcdctmgr.c" />
<ClCompile Include="..\..\external\jpeg-9b\jchuff.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcinit.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcmainct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcmarker.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcmaster.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcomapi.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcparam.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcprepct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jcsample.c" />
<ClCompile Include="..\..\external\jpeg-9b\jctrans.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdapimin.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdapistd.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdarith.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdatadst.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdatasrc.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdcoefct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdcolor.c" />
<ClCompile Include="..\..\external\jpeg-9b\jddctmgr.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdhuff.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdinput.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdmainct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdmarker.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdmaster.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdmerge.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdpostct.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdsample.c" />
<ClCompile Include="..\..\external\jpeg-9b\jdtrans.c" />
<ClCompile Include="..\..\external\jpeg-9b\jerror.c" />
<ClCompile Include="..\..\external\jpeg-9b\jfdctflt.c" />
<ClCompile Include="..\..\external\jpeg-9b\jfdctfst.c" />
<ClCompile Include="..\..\external\jpeg-9b\jfdctint.c" />
<ClCompile Include="..\..\external\jpeg-9b\jidctflt.c" />
<ClCompile Include="..\..\external\jpeg-9b\jidctfst.c" />
<ClCompile Include="..\..\external\jpeg-9b\jidctint.c" />
<ClCompile Include="..\..\external\jpeg-9b\jmemansi.c" />
<ClCompile Include="..\..\external\jpeg-9b\jmemmgr.c" />
<ClCompile Include="..\..\external\jpeg-9b\jquant1.c" />
<ClCompile Include="..\..\external\jpeg-9b\jquant2.c" />
<ClCompile Include="..\..\external\jpeg-9b\jutils.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\external\jpeg-9\cderror.h" />
<ClInclude Include="..\..\external\jpeg-9\cdjpeg.h" />
<ClInclude Include="..\..\external\jpeg-9\jconfig.h" />
<ClInclude Include="..\..\external\jpeg-9\jdct.h" />
<ClInclude Include="..\..\external\jpeg-9\jerror.h" />
<ClInclude Include="..\..\external\jpeg-9\jinclude.h" />
<ClInclude Include="..\..\external\jpeg-9\jmemsys.h" />
<ClInclude Include="..\..\external\jpeg-9\jmorecfg.h" />
<ClInclude Include="..\..\external\jpeg-9\jpegint.h" />
<ClInclude Include="..\..\external\jpeg-9\jpeglib.h" />
<ClInclude Include="..\..\external\jpeg-9\jversion.h" />
<ClInclude Include="..\..\external\jpeg-9\transupp.h" />
<ClInclude Include="..\..\external\jpeg-9b\cderror.h" />
<ClInclude Include="..\..\external\jpeg-9b\cdjpeg.h" />
<ClInclude Include="..\..\external\jpeg-9b\jconfig.h" />
<ClInclude Include="..\..\external\jpeg-9b\jdct.h" />
<ClInclude Include="..\..\external\jpeg-9b\jerror.h" />
<ClInclude Include="..\..\external\jpeg-9b\jinclude.h" />
<ClInclude Include="..\..\external\jpeg-9b\jmemsys.h" />
<ClInclude Include="..\..\external\jpeg-9b\jmorecfg.h" />
<ClInclude Include="..\..\external\jpeg-9b\jpegint.h" />
<ClInclude Include="..\..\external\jpeg-9b\jpeglib.h" />
<ClInclude Include="..\..\external\jpeg-9b\jversion.h" />
<ClInclude Include="..\..\external\jpeg-9b\transupp.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit 740121a

Please sign in to comment.