AxioDL
/
libjpeg-turbo
mirror of https://github.com/AxioDL/libjpeg-turbo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjusted for Visual Studio

This commit is contained in:
Jack Andersen 2014-09-09 12:11:59 -10:00
parent 3b74b89769
commit bfdfa1062c
10 changed files with 320 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.h
View File

@ -65,7 +65,11 @@
/* #undef INCOMPLETE_TYPES_BROKEN */ /* #undef INCOMPLETE_TYPES_BROKEN */
/* How to obtain function inlining. */ /* How to obtain function inlining. */
#if _WIN32
#define INLINE __inline
#else
#define INLINE __attribute__((always_inline)) #define INLINE __attribute__((always_inline))
#endif
/* libjpeg API version */ /* libjpeg API version */
#define JPEG_LIB_VERSION 62 #define JPEG_LIB_VERSION 62

0
jccolext.c → jccolext.h
View File

14
jccolor.c
View File

@ -85,7 +85,7 @@ typedef my_color_converter * my_cconvert_ptr;
/* Include inline routines for colorspace extensions */ /* Include inline routines for colorspace extensions */
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -98,7 +98,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extrgb_ycc_convert_internal #define rgb_ycc_convert_internal extrgb_ycc_convert_internal
#define rgb_gray_convert_internal extrgb_gray_convert_internal #define rgb_gray_convert_internal extrgb_gray_convert_internal
#define rgb_rgb_convert_internal extrgb_rgb_convert_internal #define rgb_rgb_convert_internal extrgb_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -114,7 +114,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extrgbx_ycc_convert_internal #define rgb_ycc_convert_internal extrgbx_ycc_convert_internal
#define rgb_gray_convert_internal extrgbx_gray_convert_internal #define rgb_gray_convert_internal extrgbx_gray_convert_internal
#define rgb_rgb_convert_internal extrgbx_rgb_convert_internal #define rgb_rgb_convert_internal extrgbx_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -130,7 +130,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extbgr_ycc_convert_internal #define rgb_ycc_convert_internal extbgr_ycc_convert_internal
#define rgb_gray_convert_internal extbgr_gray_convert_internal #define rgb_gray_convert_internal extbgr_gray_convert_internal
#define rgb_rgb_convert_internal extbgr_rgb_convert_internal #define rgb_rgb_convert_internal extbgr_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -146,7 +146,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extbgrx_ycc_convert_internal #define rgb_ycc_convert_internal extbgrx_ycc_convert_internal
#define rgb_gray_convert_internal extbgrx_gray_convert_internal #define rgb_gray_convert_internal extbgrx_gray_convert_internal
#define rgb_rgb_convert_internal extbgrx_rgb_convert_internal #define rgb_rgb_convert_internal extbgrx_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -162,7 +162,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extxbgr_ycc_convert_internal #define rgb_ycc_convert_internal extxbgr_ycc_convert_internal
#define rgb_gray_convert_internal extxbgr_gray_convert_internal #define rgb_gray_convert_internal extxbgr_gray_convert_internal
#define rgb_rgb_convert_internal extxbgr_rgb_convert_internal #define rgb_rgb_convert_internal extxbgr_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -178,7 +178,7 @@ typedef my_color_converter * my_cconvert_ptr;
#define rgb_ycc_convert_internal extxrgb_ycc_convert_internal #define rgb_ycc_convert_internal extxrgb_ycc_convert_internal
#define rgb_gray_convert_internal extxrgb_gray_convert_internal #define rgb_gray_convert_internal extxrgb_gray_convert_internal
#define rgb_rgb_convert_internal extxrgb_rgb_convert_internal #define rgb_rgb_convert_internal extxrgb_rgb_convert_internal
#include "jccolext.c" #include "jccolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE

0
jdcolext.c → jdcolext.h
View File

14
jdcolor.c
View File

@ -90,7 +90,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
/* Include inline routines for colorspace extensions */ /* Include inline routines for colorspace extensions */
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -103,7 +103,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extrgb_convert_internal #define ycc_rgb_convert_internal ycc_extrgb_convert_internal
#define gray_rgb_convert_internal gray_extrgb_convert_internal #define gray_rgb_convert_internal gray_extrgb_convert_internal
#define rgb_rgb_convert_internal rgb_extrgb_convert_internal #define rgb_rgb_convert_internal rgb_extrgb_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -120,7 +120,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extrgbx_convert_internal #define ycc_rgb_convert_internal ycc_extrgbx_convert_internal
#define gray_rgb_convert_internal gray_extrgbx_convert_internal #define gray_rgb_convert_internal gray_extrgbx_convert_internal
#define rgb_rgb_convert_internal rgb_extrgbx_convert_internal #define rgb_rgb_convert_internal rgb_extrgbx_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -137,7 +137,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extbgr_convert_internal #define ycc_rgb_convert_internal ycc_extbgr_convert_internal
#define gray_rgb_convert_internal gray_extbgr_convert_internal #define gray_rgb_convert_internal gray_extbgr_convert_internal
#define rgb_rgb_convert_internal rgb_extbgr_convert_internal #define rgb_rgb_convert_internal rgb_extbgr_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -154,7 +154,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extbgrx_convert_internal #define ycc_rgb_convert_internal ycc_extbgrx_convert_internal
#define gray_rgb_convert_internal gray_extbgrx_convert_internal #define gray_rgb_convert_internal gray_extbgrx_convert_internal
#define rgb_rgb_convert_internal rgb_extbgrx_convert_internal #define rgb_rgb_convert_internal rgb_extbgrx_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -172,7 +172,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extxbgr_convert_internal #define ycc_rgb_convert_internal ycc_extxbgr_convert_internal
#define gray_rgb_convert_internal gray_extxbgr_convert_internal #define gray_rgb_convert_internal gray_extxbgr_convert_internal
#define rgb_rgb_convert_internal rgb_extxbgr_convert_internal #define rgb_rgb_convert_internal rgb_extxbgr_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -190,7 +190,7 @@ typedef my_color_deconverter * my_cconvert_ptr;
#define ycc_rgb_convert_internal ycc_extxrgb_convert_internal #define ycc_rgb_convert_internal ycc_extxrgb_convert_internal
#define gray_rgb_convert_internal gray_extxrgb_convert_internal #define gray_rgb_convert_internal gray_extxrgb_convert_internal
#define rgb_rgb_convert_internal rgb_extxrgb_convert_internal #define rgb_rgb_convert_internal rgb_extxrgb_convert_internal
#include "jdcolext.c" #include "jdcolext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE

14
jdmerge.c
View File

@ -81,7 +81,7 @@ typedef my_upsampler * my_upsample_ptr;
/* Include inline routines for colorspace extensions */ /* Include inline routines for colorspace extensions */
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -93,7 +93,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_RGB_PIXELSIZE #define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
#define h2v1_merged_upsample_internal extrgb_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extrgb_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extrgb_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extrgb_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -108,7 +108,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE #define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
#define h2v1_merged_upsample_internal extrgbx_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extrgbx_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extrgbx_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extrgbx_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -123,7 +123,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_BGR_PIXELSIZE #define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
#define h2v1_merged_upsample_internal extbgr_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extbgr_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extbgr_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extbgr_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -138,7 +138,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE #define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
#define h2v1_merged_upsample_internal extbgrx_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extbgrx_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extbgrx_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extbgrx_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -154,7 +154,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE #define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
#define h2v1_merged_upsample_internal extxbgr_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extxbgr_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extxbgr_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extxbgr_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE
@ -170,7 +170,7 @@ typedef my_upsampler * my_upsample_ptr;
#define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE #define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
#define h2v1_merged_upsample_internal extxrgb_h2v1_merged_upsample_internal #define h2v1_merged_upsample_internal extxrgb_h2v1_merged_upsample_internal
#define h2v2_merged_upsample_internal extxrgb_h2v2_merged_upsample_internal #define h2v2_merged_upsample_internal extxrgb_h2v2_merged_upsample_internal
#include "jdmrgext.c" #include "jdmrgext.h"
#undef RGB_RED #undef RGB_RED
#undef RGB_GREEN #undef RGB_GREEN
#undef RGB_BLUE #undef RGB_BLUE

8
jdmrgext.c → jdmrgext.h
View File

@ -18,6 +18,14 @@
* Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical. * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
*/ */
#ifndef INLINE
#define INLINE __inline
#endif
#ifndef LOCAL
#define LOCAL(type) static type
#endif
INLINE INLINE
LOCAL(void) LOCAL(void)
h2v1_merged_upsample_internal (j_decompress_ptr cinfo, h2v1_merged_upsample_internal (j_decompress_ptr cinfo,

175
libjpeg-turbo-vse2013/libjpeg-turbo-vse2013.vcxproj Normal file
View File

@ -0,0 +1,175 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4CE5A1F6-F8FA-4684-ADE0-E89DB9A4A54A}</ProjectGuid>
<RootNamespace>libjpegturbovse2013</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetExt>.lib</TargetExt>
<IncludePath>$(SolutionDir)\extern\libjpeg-turbo;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<ShowIncludes>true</ShowIncludes>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\cdjpeg.c" />
<ClCompile Include="..\cjpeg.c" />
<ClCompile Include="..\djpeg.c" />
<ClCompile Include="..\example.c" />
<ClCompile Include="..\jaricom.c" />
<ClCompile Include="..\jcapimin.c" />
<ClCompile Include="..\jcapistd.c" />
<ClCompile Include="..\jcarith.c" />
<ClCompile Include="..\jccoefct.c" />
<ClInclude Include="..\jccolext.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClCompile Include="..\jccolor.c" />
<ClCompile Include="..\jcdctmgr.c" />
<ClCompile Include="..\jchuff.c" />
<ClCompile Include="..\jcinit.c" />
<ClCompile Include="..\jcmainct.c" />
<ClCompile Include="..\jcmarker.c" />
<ClCompile Include="..\jcmaster.c" />
<ClCompile Include="..\jcomapi.c" />
<ClCompile Include="..\jcparam.c" />
<ClCompile Include="..\jcphuff.c" />
<ClCompile Include="..\jcprepct.c" />
<ClCompile Include="..\jcsample.c" />
<ClCompile Include="..\jcstest.c" />
<ClCompile Include="..\jctrans.c" />
<ClCompile Include="..\jdapimin.c" />
<ClCompile Include="..\jdapistd.c" />
<ClCompile Include="..\jdarith.c" />
<ClCompile Include="..\jdatadst-tj.c" />
<ClCompile Include="..\jdatadst.c" />
<ClCompile Include="..\jdatasrc-tj.c" />
<ClCompile Include="..\jdatasrc.c" />
<ClCompile Include="..\jdcoefct.c" />
<ClInclude Include="..\jdcolext.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClCompile Include="..\jdcolor.c" />
<ClCompile Include="..\jddctmgr.c" />
<ClCompile Include="..\jdhuff.c" />
<ClCompile Include="..\jdinput.c" />
<ClCompile Include="..\jdmainct.c" />
<ClCompile Include="..\jdmarker.c" />
<ClCompile Include="..\jdmaster.c" />
<ClCompile Include="..\jdmerge.c" />
<ClInclude Include="..\jdmrgext.h">
<FileType>CppCode</FileType>
</ClInclude>
<ClCompile Include="..\jdphuff.c" />
<ClCompile Include="..\jdpostct.c" />
<ClCompile Include="..\jdsample.c" />
<ClCompile Include="..\jdtrans.c" />
<ClCompile Include="..\jerror.c" />
<ClCompile Include="..\jfdctflt.c" />
<ClCompile Include="..\jfdctfst.c" />
<ClCompile Include="..\jfdctint.c" />
<ClCompile Include="..\jidctflt.c" />
<ClCompile Include="..\jidctfst.c" />
<ClCompile Include="..\jidctint.c" />
<ClCompile Include="..\jidctred.c" />
<ClCompile Include="..\jmemmgr.c" />
<ClCompile Include="..\jmemnobs.c" />
<ClCompile Include="..\jpegtran.c" />
<ClCompile Include="..\jquant1.c" />
<ClCompile Include="..\jquant2.c" />
<ClCompile Include="..\jsimd_none.c" />
<ClCompile Include="..\jutils.c" />
<ClCompile Include="..\rdbmp.c" />
<ClCompile Include="..\rdcolmap.c" />
<ClCompile Include="..\tjutil.c" />
<ClCompile Include="..\transupp.c" />
<ClCompile Include="..\turbojpeg.c" />
<ClCompile Include="..\wrjpgcom.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cderror.h" />
<ClInclude Include="..\cdjpeg.h" />
<ClInclude Include="..\config.h" />
<ClInclude Include="..\jchuff.h" />
<ClInclude Include="..\jconfig.h" />
<ClInclude Include="..\jdct.h" />
<ClInclude Include="..\jdhuff.h" />
<ClInclude Include="..\jerror.h" />
<ClInclude Include="..\jinclude.h" />
<ClInclude Include="..\jmemsys.h" />
<ClInclude Include="..\jmorecfg.h" />
<ClInclude Include="..\jpegcomp.h" />
<ClInclude Include="..\jpegint.h" />
<ClInclude Include="..\jpeglib.h" />
<ClInclude Include="..\jsimd.h" />
<ClInclude Include="..\jsimddct.h" />
<ClInclude Include="..\jversion.h" />
<ClInclude Include="..\tjutil.h" />
<ClInclude Include="..\transupp.h" />
<ClInclude Include="..\turbojpeg.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\README" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

97
libjpeg-turbo-vse2013/libjpeg-turbo-vse2013.vcxproj.filters Normal file
View File

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\cdjpeg.c" />
<ClCompile Include="..\cjpeg.c" />
<ClCompile Include="..\djpeg.c" />
<ClCompile Include="..\example.c" />
<ClCompile Include="..\jaricom.c" />
<ClCompile Include="..\jcapimin.c" />
<ClCompile Include="..\jcapistd.c" />
<ClCompile Include="..\jcarith.c" />
<ClCompile Include="..\jccoefct.c" />
<ClCompile Include="..\jccolor.c" />
<ClCompile Include="..\jcdctmgr.c" />
<ClCompile Include="..\jchuff.c" />
<ClCompile Include="..\jcinit.c" />
<ClCompile Include="..\jcmainct.c" />
<ClCompile Include="..\jcmarker.c" />
<ClCompile Include="..\jcmaster.c" />
<ClCompile Include="..\jcomapi.c" />
<ClCompile Include="..\jcparam.c" />
<ClCompile Include="..\jcphuff.c" />
<ClCompile Include="..\jcprepct.c" />
<ClCompile Include="..\jcsample.c" />
<ClCompile Include="..\jcstest.c" />
<ClCompile Include="..\jctrans.c" />
<ClCompile Include="..\jdapimin.c" />
<ClCompile Include="..\jdapistd.c" />
<ClCompile Include="..\jdarith.c" />
<ClCompile Include="..\jdatadst.c" />
<ClCompile Include="..\jdatadst-tj.c" />
<ClCompile Include="..\jdatasrc.c" />
<ClCompile Include="..\jdatasrc-tj.c" />
<ClCompile Include="..\jdcoefct.c" />
<ClCompile Include="..\jdcolor.c" />
<ClCompile Include="..\jddctmgr.c" />
<ClCompile Include="..\jdhuff.c" />
<ClCompile Include="..\jdinput.c" />
<ClCompile Include="..\jdmainct.c" />
<ClCompile Include="..\jdmarker.c" />
<ClCompile Include="..\jdmaster.c" />
<ClCompile Include="..\jdmerge.c" />
<ClCompile Include="..\jdphuff.c" />
<ClCompile Include="..\jdpostct.c" />
<ClCompile Include="..\jdsample.c" />
<ClCompile Include="..\jdtrans.c" />
<ClCompile Include="..\jerror.c" />
<ClCompile Include="..\jfdctflt.c" />
<ClCompile Include="..\jfdctfst.c" />
<ClCompile Include="..\jfdctint.c" />
<ClCompile Include="..\jidctflt.c" />
<ClCompile Include="..\jidctfst.c" />
<ClCompile Include="..\jidctint.c" />
<ClCompile Include="..\jidctred.c" />
<ClCompile Include="..\jmemmgr.c" />
<ClCompile Include="..\jmemnobs.c" />
<ClCompile Include="..\jpegtran.c" />
<ClCompile Include="..\jquant1.c" />
<ClCompile Include="..\jquant2.c" />
<ClCompile Include="..\jsimd_none.c" />
<ClCompile Include="..\jutils.c" />
<ClCompile Include="..\rdbmp.c" />
<ClCompile Include="..\rdcolmap.c" />
<ClCompile Include="..\tjutil.c" />
<ClCompile Include="..\transupp.c" />
<ClCompile Include="..\turbojpeg.c" />
<ClCompile Include="..\wrjpgcom.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cderror.h" />
<ClInclude Include="..\cdjpeg.h" />
<ClInclude Include="..\config.h" />
<ClInclude Include="..\jchuff.h" />
<ClInclude Include="..\jconfig.h" />
<ClInclude Include="..\jdct.h" />
<ClInclude Include="..\jdhuff.h" />
<ClInclude Include="..\jerror.h" />
<ClInclude Include="..\jinclude.h" />
<ClInclude Include="..\jmemsys.h" />
<ClInclude Include="..\jmorecfg.h" />
<ClInclude Include="..\jpegcomp.h" />
<ClInclude Include="..\jpegint.h" />
<ClInclude Include="..\jpeglib.h" />
<ClInclude Include="..\jsimd.h" />
<ClInclude Include="..\jsimddct.h" />
<ClInclude Include="..\jversion.h" />
<ClInclude Include="..\tjutil.h" />
<ClInclude Include="..\transupp.h" />
<ClInclude Include="..\turbojpeg.h" />
<ClInclude Include="..\jdmrgext.h" />
<ClInclude Include="..\jdcolext.h" />
<ClInclude Include="..\jccolext.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\README" />
</ItemGroup>
</Project>

30
turbojpeg.c
View File

@ -612,9 +612,9 @@ DLLEXPORT int DLLCALL tjCompress2(tjhandle handle, unsigned char *srcBuf,
cinfo->image_width=width; cinfo->image_width=width;
cinfo->image_height=height; cinfo->image_height=height;
if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1"); if(flags&TJFLAG_FORCEMMX) _putenv("JSIMD_FORCEMMX=1");
else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE) _putenv("JSIMD_FORCESSE=1");
else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if(flags&TJFLAG_FORCESSE2) _putenv("JSIMD_FORCESSE2=1");
if(flags&TJFLAG_NOREALLOC) if(flags&TJFLAG_NOREALLOC)
{ {
@ -723,9 +723,9 @@ DLLEXPORT int DLLCALL tjEncodeYUV2(tjhandle handle, unsigned char *srcBuf,
cinfo->image_width=width; cinfo->image_width=width;
cinfo->image_height=height; cinfo->image_height=height;
if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1"); if(flags&TJFLAG_FORCEMMX) _putenv("JSIMD_FORCEMMX=1");
else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE) _putenv("JSIMD_FORCESSE=1");
else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if(flags&TJFLAG_FORCESSE2) _putenv("JSIMD_FORCESSE2=1");
yuvsize=tjBufSizeYUV(width, height, subsamp); yuvsize=tjBufSizeYUV(width, height, subsamp);
jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0); jpeg_mem_dest_tj(cinfo, &dstBuf, &yuvsize, 0);
@ -945,9 +945,9 @@ DLLEXPORT int DLLCALL tjDecompress2(tjhandle handle, unsigned char *jpegBuf,
|| height<0 || pixelFormat<0 || pixelFormat>=TJ_NUMPF) || height<0 || pixelFormat<0 || pixelFormat>=TJ_NUMPF)
_throw("tjDecompress2(): Invalid argument"); _throw("tjDecompress2(): Invalid argument");
if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1"); if(flags&TJFLAG_FORCEMMX) _putenv("JSIMD_FORCEMMX=1");
else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE) _putenv("JSIMD_FORCESSE=1");
else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if(flags&TJFLAG_FORCESSE2) _putenv("JSIMD_FORCESSE2=1");
if(setjmp(this->jerr.setjmp_buffer)) if(setjmp(this->jerr.setjmp_buffer))
{ {
@ -1060,9 +1060,9 @@ DLLEXPORT int DLLCALL tjDecompressToYUV(tjhandle handle,
if(jpegBuf==NULL || jpegSize<=0 || dstBuf==NULL) if(jpegBuf==NULL || jpegSize<=0 || dstBuf==NULL)
_throw("tjDecompressToYUV(): Invalid argument"); _throw("tjDecompressToYUV(): Invalid argument");
if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1"); if(flags&TJFLAG_FORCEMMX) _putenv("JSIMD_FORCEMMX=1");
else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE) _putenv("JSIMD_FORCESSE=1");
else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if(flags&TJFLAG_FORCESSE2) _putenv("JSIMD_FORCESSE2=1");
if(setjmp(this->jerr.setjmp_buffer)) if(setjmp(this->jerr.setjmp_buffer))
{ {
@ -1191,9 +1191,9 @@ DLLEXPORT int DLLCALL tjTransform(tjhandle handle, unsigned char *jpegBuf,
|| t==NULL || flags<0) || t==NULL || flags<0)
_throw("tjTransform(): Invalid argument"); _throw("tjTransform(): Invalid argument");
if(flags&TJFLAG_FORCEMMX) putenv("JSIMD_FORCEMMX=1"); if(flags&TJFLAG_FORCEMMX) _putenv("JSIMD_FORCEMMX=1");
else if(flags&TJFLAG_FORCESSE) putenv("JSIMD_FORCESSE=1"); else if(flags&TJFLAG_FORCESSE) _putenv("JSIMD_FORCESSE=1");
else if(flags&TJFLAG_FORCESSE2) putenv("JSIMD_FORCESSE2=1"); else if(flags&TJFLAG_FORCESSE2) _putenv("JSIMD_FORCESSE2=1");
if(setjmp(this->jerr.setjmp_buffer)) if(setjmp(this->jerr.setjmp_buffer))
{ {