Merge branch 'libjpeg-turbo'
* libjpeg-turbo: (39 commits) Oops. Delete the duplicate copy of [lib]turbojpeg.dll in the binary directory when uninstalling the package. AltiVec SIMD implementation of sample conversion and integer quantization Document the fact that the AltiVec implementation uses the same modified algorithms as the SSE2 implementation Use intrinsics for loading/storing data in the DCT/IDCT functions. This has no effect on the performance of the aligned loads/stores, but it makes it more obvious what that code is doing. Using intrinsics for the unaligned stores in the inverse DCT functions increases overall decompression performance by 1-2%. AltiVec SIMD implementation of RGB-to-Grayscale color conversion Remove unneeded code; Make sure jccolor-altivec.o will be rebuilt if jccolext-altivec.c changes. AltiVec SIMD implementation of RGB-to-YCC color conversion Make test a phony target so things don't go haywire if there is a file named test.c in the current directory. Maintain the traditional order of the regression tests while allowing the TurboJPEG and libjpeg portions to be executed separately Make comments more consistent Add a "quicktest" pseudo-target, for those times when you just don't want to sit through 11 iterations of TJUnitTest. Cosmetic tweaks to the PowerPC SIMD stubs Split AltiVec algorithms into separate files for ease of maintenance; Rename constants using lowercase so they are not confused with macros Optimizations to the AltiVec DCT algorithms (pre-compute constants and combine multiply/add operations) AltiVec SIMD implementation of slow integer inverse DCT Use macros to allocate constants statically, rather than reading them from a table using vec_splat*(). This improves code readability and probably improves performance a bit as well. Swap the order of the IFAST and ISLOW FDCT functions so that it matches the order of the prototypes in jsimd.h and the stubs in jsimd_powerpc.c. Include ARMv8 binaries when generating a combined OS X/iOS package using 'make iosdmg' In the output of the configure script, indicate whether gas-preprocessor.pl is being used along with the assembler. Modify the ARM64 assembly file so that it uses only syntax that the clang assembler in XCode 5.x can understand. These changes should all be cosmetic in nature-- they do not change the meaning or readability of the code nor the ability to build it for Linux. Actually, the code is now more in compliance with the ARM64 programming manual. In addition to these changes, there were a couple of instructions that clang simply doesn't support, so gas-preprocessor.pl was modified so that it now converts those into equivalent instructions that clang can handle. ... Conflicts: BUILDING.txt ChangeLog.txt cjpeg.c jpegtran.c
This commit is contained in:
10
jpeglib.h
10
jpeglib.h
@@ -923,6 +923,16 @@ struct jpeg_memory_mgr {
|
||||
typedef boolean (*jpeg_marker_parser_method) (j_decompress_ptr cinfo);
|
||||
|
||||
|
||||
/* Originally, this macro was used as a way of defining function prototypes
|
||||
* for both modern compilers as well as older compilers that did not support
|
||||
* prototype parameters. libjpeg-turbo has never supported these older,
|
||||
* non-ANSI compilers, but the macro is still included because there is some
|
||||
* software out there that uses it.
|
||||
*/
|
||||
|
||||
#define JPP(arglist) arglist
|
||||
|
||||
|
||||
/* Default error-management setup */
|
||||
EXTERN(struct jpeg_error_mgr *) jpeg_std_error (struct jpeg_error_mgr * err);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user