mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-07 05:15:09 +00:00
4991ef2f9d
Also includes the fix for upstream issue #288 to avoid crashes on some older Win7 systems. Differential Revision: https://phabricator.services.mozilla.com/D7758 --HG-- rename : media/libjpeg/simd/jsimd_arm.c => media/libjpeg/simd/arm/jsimd.c rename : media/libjpeg/simd/jsimd_arm_neon.S => media/libjpeg/simd/arm/jsimd_neon.S rename : media/libjpeg/simd/jsimd_arm64.c => media/libjpeg/simd/arm64/jsimd.c rename : media/libjpeg/simd/jsimd_arm64_neon.S => media/libjpeg/simd/arm64/jsimd_neon.S rename : media/libjpeg/simd/jccolext-mmx.asm => media/libjpeg/simd/i386/jccolext-mmx.asm rename : media/libjpeg/simd/jccolext-sse2.asm => media/libjpeg/simd/i386/jccolext-sse2.asm rename : media/libjpeg/simd/jccolor-mmx.asm => media/libjpeg/simd/i386/jccolor-mmx.asm rename : media/libjpeg/simd/jccolor-sse2.asm => media/libjpeg/simd/i386/jccolor-sse2.asm rename : media/libjpeg/simd/jcgray-mmx.asm => media/libjpeg/simd/i386/jcgray-mmx.asm rename : media/libjpeg/simd/jcgray-sse2.asm => media/libjpeg/simd/i386/jcgray-sse2.asm rename : media/libjpeg/simd/jcgryext-mmx.asm => media/libjpeg/simd/i386/jcgryext-mmx.asm rename : media/libjpeg/simd/jcgryext-sse2.asm => media/libjpeg/simd/i386/jcgryext-sse2.asm rename : media/libjpeg/simd/jchuff-sse2.asm => media/libjpeg/simd/i386/jchuff-sse2.asm rename : media/libjpeg/simd/jcsample-mmx.asm => media/libjpeg/simd/i386/jcsample-mmx.asm rename : media/libjpeg/simd/jcsample-sse2.asm => media/libjpeg/simd/i386/jcsample-sse2.asm rename : media/libjpeg/simd/jdcolext-mmx.asm => media/libjpeg/simd/i386/jdcolext-mmx.asm rename : media/libjpeg/simd/jdcolext-sse2.asm => media/libjpeg/simd/i386/jdcolext-sse2.asm rename : media/libjpeg/simd/jdcolor-mmx.asm => media/libjpeg/simd/i386/jdcolor-mmx.asm rename : media/libjpeg/simd/jdcolor-sse2.asm => media/libjpeg/simd/i386/jdcolor-sse2.asm rename : media/libjpeg/simd/jdmerge-mmx.asm => media/libjpeg/simd/i386/jdmerge-mmx.asm rename : media/libjpeg/simd/jdmerge-sse2.asm => media/libjpeg/simd/i386/jdmerge-sse2.asm rename : media/libjpeg/simd/jdmrgext-mmx.asm => media/libjpeg/simd/i386/jdmrgext-mmx.asm rename : media/libjpeg/simd/jdmrgext-sse2.asm => media/libjpeg/simd/i386/jdmrgext-sse2.asm rename : media/libjpeg/simd/jdsample-mmx.asm => media/libjpeg/simd/i386/jdsample-mmx.asm rename : media/libjpeg/simd/jdsample-sse2.asm => media/libjpeg/simd/i386/jdsample-sse2.asm rename : media/libjpeg/simd/jfdctflt-3dn.asm => media/libjpeg/simd/i386/jfdctflt-3dn.asm rename : media/libjpeg/simd/jfdctflt-sse.asm => media/libjpeg/simd/i386/jfdctflt-sse.asm rename : media/libjpeg/simd/jfdctfst-mmx.asm => media/libjpeg/simd/i386/jfdctfst-mmx.asm rename : media/libjpeg/simd/jfdctfst-sse2.asm => media/libjpeg/simd/i386/jfdctfst-sse2.asm rename : media/libjpeg/simd/jfdctint-mmx.asm => media/libjpeg/simd/i386/jfdctint-mmx.asm rename : media/libjpeg/simd/jfdctint-sse2.asm => media/libjpeg/simd/i386/jfdctint-sse2.asm rename : media/libjpeg/simd/jidctflt-3dn.asm => media/libjpeg/simd/i386/jidctflt-3dn.asm rename : media/libjpeg/simd/jidctflt-sse.asm => media/libjpeg/simd/i386/jidctflt-sse.asm rename : media/libjpeg/simd/jidctflt-sse2.asm => media/libjpeg/simd/i386/jidctflt-sse2.asm rename : media/libjpeg/simd/jidctfst-mmx.asm => media/libjpeg/simd/i386/jidctfst-mmx.asm rename : media/libjpeg/simd/jidctfst-sse2.asm => media/libjpeg/simd/i386/jidctfst-sse2.asm rename : media/libjpeg/simd/jidctint-mmx.asm => media/libjpeg/simd/i386/jidctint-mmx.asm rename : media/libjpeg/simd/jidctint-sse2.asm => media/libjpeg/simd/i386/jidctint-sse2.asm rename : media/libjpeg/simd/jidctred-mmx.asm => media/libjpeg/simd/i386/jidctred-mmx.asm rename : media/libjpeg/simd/jidctred-sse2.asm => media/libjpeg/simd/i386/jidctred-sse2.asm rename : media/libjpeg/simd/jquant-3dn.asm => media/libjpeg/simd/i386/jquant-3dn.asm rename : media/libjpeg/simd/jquant-mmx.asm => media/libjpeg/simd/i386/jquant-mmx.asm rename : media/libjpeg/simd/jquant-sse.asm => media/libjpeg/simd/i386/jquant-sse.asm rename : media/libjpeg/simd/jquantf-sse2.asm => media/libjpeg/simd/i386/jquantf-sse2.asm rename : media/libjpeg/simd/jquanti-sse2.asm => media/libjpeg/simd/i386/jquanti-sse2.asm rename : media/libjpeg/simd/jsimd_i386.c => media/libjpeg/simd/i386/jsimd.c rename : media/libjpeg/simd/jsimdcpu.asm => media/libjpeg/simd/i386/jsimdcpu.asm rename : media/libjpeg/simd/jsimd_mips.c => media/libjpeg/simd/mips/jsimd.c rename : media/libjpeg/simd/jsimd_mips_dspr2.S => media/libjpeg/simd/mips/jsimd_dspr2.S rename : media/libjpeg/simd/jsimd_mips_dspr2_asm.h => media/libjpeg/simd/mips/jsimd_dspr2_asm.h rename : media/libjpeg/simd/jcolsamp.inc => media/libjpeg/simd/nasm/jcolsamp.inc rename : media/libjpeg/simd/jdct.inc => media/libjpeg/simd/nasm/jdct.inc rename : media/libjpeg/simd/jpeg_nbits_table.inc => media/libjpeg/simd/nasm/jpeg_nbits_table.inc rename : media/libjpeg/simd/jsimdcfg.inc => media/libjpeg/simd/nasm/jsimdcfg.inc rename : media/libjpeg/simd/jsimdext.inc => media/libjpeg/simd/nasm/jsimdext.inc rename : media/libjpeg/simd/jccolext-altivec.c => media/libjpeg/simd/powerpc/jccolext-altivec.c rename : media/libjpeg/simd/jccolor-altivec.c => media/libjpeg/simd/powerpc/jccolor-altivec.c rename : media/libjpeg/simd/jcgray-altivec.c => media/libjpeg/simd/powerpc/jcgray-altivec.c rename : media/libjpeg/simd/jcgryext-altivec.c => media/libjpeg/simd/powerpc/jcgryext-altivec.c rename : media/libjpeg/simd/jcsample-altivec.c => media/libjpeg/simd/powerpc/jcsample-altivec.c rename : media/libjpeg/simd/jcsample.h => media/libjpeg/simd/powerpc/jcsample.h rename : media/libjpeg/simd/jdcolext-altivec.c => media/libjpeg/simd/powerpc/jdcolext-altivec.c rename : media/libjpeg/simd/jdcolor-altivec.c => media/libjpeg/simd/powerpc/jdcolor-altivec.c rename : media/libjpeg/simd/jdmerge-altivec.c => media/libjpeg/simd/powerpc/jdmerge-altivec.c rename : media/libjpeg/simd/jdmrgext-altivec.c => media/libjpeg/simd/powerpc/jdmrgext-altivec.c rename : media/libjpeg/simd/jdsample-altivec.c => media/libjpeg/simd/powerpc/jdsample-altivec.c rename : media/libjpeg/simd/jfdctfst-altivec.c => media/libjpeg/simd/powerpc/jfdctfst-altivec.c rename : media/libjpeg/simd/jfdctint-altivec.c => media/libjpeg/simd/powerpc/jfdctint-altivec.c rename : media/libjpeg/simd/jidctfst-altivec.c => media/libjpeg/simd/powerpc/jidctfst-altivec.c rename : media/libjpeg/simd/jidctint-altivec.c => media/libjpeg/simd/powerpc/jidctint-altivec.c rename : media/libjpeg/simd/jquanti-altivec.c => media/libjpeg/simd/powerpc/jquanti-altivec.c rename : media/libjpeg/simd/jsimd_powerpc.c => media/libjpeg/simd/powerpc/jsimd.c rename : media/libjpeg/simd/jsimd_altivec.h => media/libjpeg/simd/powerpc/jsimd_altivec.h rename : media/libjpeg/simd/jccolext-sse2-64.asm => media/libjpeg/simd/x86_64/jccolext-sse2.asm rename : media/libjpeg/simd/jccolor-sse2-64.asm => media/libjpeg/simd/x86_64/jccolor-sse2.asm rename : media/libjpeg/simd/jcgray-sse2-64.asm => media/libjpeg/simd/x86_64/jcgray-sse2.asm rename : media/libjpeg/simd/jcgryext-sse2-64.asm => media/libjpeg/simd/x86_64/jcgryext-sse2.asm rename : media/libjpeg/simd/jchuff-sse2-64.asm => media/libjpeg/simd/x86_64/jchuff-sse2.asm rename : media/libjpeg/simd/jcsample-sse2-64.asm => media/libjpeg/simd/x86_64/jcsample-sse2.asm rename : media/libjpeg/simd/jdcolext-sse2-64.asm => media/libjpeg/simd/x86_64/jdcolext-sse2.asm rename : media/libjpeg/simd/jdcolor-sse2-64.asm => media/libjpeg/simd/x86_64/jdcolor-sse2.asm rename : media/libjpeg/simd/jdmerge-sse2-64.asm => media/libjpeg/simd/x86_64/jdmerge-sse2.asm rename : media/libjpeg/simd/jdmrgext-sse2-64.asm => media/libjpeg/simd/x86_64/jdmrgext-sse2.asm rename : media/libjpeg/simd/jdsample-sse2-64.asm => media/libjpeg/simd/x86_64/jdsample-sse2.asm rename : media/libjpeg/simd/jfdctflt-sse-64.asm => media/libjpeg/simd/x86_64/jfdctflt-sse.asm rename : media/libjpeg/simd/jfdctfst-sse2-64.asm => media/libjpeg/simd/x86_64/jfdctfst-sse2.asm rename : media/libjpeg/simd/jfdctint-sse2-64.asm => media/libjpeg/simd/x86_64/jfdctint-sse2.asm rename : media/libjpeg/simd/jidctflt-sse2-64.asm => media/libjpeg/simd/x86_64/jidctflt-sse2.asm rename : media/libjpeg/simd/jidctfst-sse2-64.asm => media/libjpeg/simd/x86_64/jidctfst-sse2.asm rename : media/libjpeg/simd/jidctint-sse2-64.asm => media/libjpeg/simd/x86_64/jidctint-sse2.asm rename : media/libjpeg/simd/jidctred-sse2-64.asm => media/libjpeg/simd/x86_64/jidctred-sse2.asm rename : media/libjpeg/simd/jquantf-sse2-64.asm => media/libjpeg/simd/x86_64/jquantf-sse2.asm rename : media/libjpeg/simd/jquanti-sse2-64.asm => media/libjpeg/simd/x86_64/jquanti-sse2.asm rename : media/libjpeg/simd/jsimd_x86_64.c => media/libjpeg/simd/x86_64/jsimd.c extra : moz-landing-system : lando
172 lines
5.6 KiB
C
172 lines
5.6 KiB
C
/*
|
|
* jdicc.c
|
|
*
|
|
* Copyright (C) 1997-1998, Thomas G. Lane, Todd Newman.
|
|
* Copyright (C) 2017, D. R. Commander.
|
|
* For conditions of distribution and use, see the accompanying README.ijg
|
|
* file.
|
|
*
|
|
* This file provides code to read International Color Consortium (ICC) device
|
|
* profiles embedded in JFIF JPEG image files. The ICC has defined a standard
|
|
* for including such data in JPEG "APP2" markers. The code given here does
|
|
* not know anything about the internal structure of the ICC profile data; it
|
|
* just knows how to get the profile data from a JPEG file while reading it.
|
|
*/
|
|
|
|
#define JPEG_INTERNALS
|
|
#include "jinclude.h"
|
|
#include "jpeglib.h"
|
|
#include "jerror.h"
|
|
|
|
#ifndef HAVE_STDLIB_H /* <stdlib.h> should declare malloc() */
|
|
extern void *malloc(size_t size);
|
|
#endif
|
|
|
|
|
|
#define ICC_MARKER (JPEG_APP0 + 2) /* JPEG marker code for ICC */
|
|
#define ICC_OVERHEAD_LEN 14 /* size of non-profile data in APP2 */
|
|
|
|
|
|
/*
|
|
* Handy subroutine to test whether a saved marker is an ICC profile marker.
|
|
*/
|
|
|
|
LOCAL(boolean)
|
|
marker_is_icc(jpeg_saved_marker_ptr marker)
|
|
{
|
|
return
|
|
marker->marker == ICC_MARKER &&
|
|
marker->data_length >= ICC_OVERHEAD_LEN &&
|
|
/* verify the identifying string */
|
|
GETJOCTET(marker->data[0]) == 0x49 &&
|
|
GETJOCTET(marker->data[1]) == 0x43 &&
|
|
GETJOCTET(marker->data[2]) == 0x43 &&
|
|
GETJOCTET(marker->data[3]) == 0x5F &&
|
|
GETJOCTET(marker->data[4]) == 0x50 &&
|
|
GETJOCTET(marker->data[5]) == 0x52 &&
|
|
GETJOCTET(marker->data[6]) == 0x4F &&
|
|
GETJOCTET(marker->data[7]) == 0x46 &&
|
|
GETJOCTET(marker->data[8]) == 0x49 &&
|
|
GETJOCTET(marker->data[9]) == 0x4C &&
|
|
GETJOCTET(marker->data[10]) == 0x45 &&
|
|
GETJOCTET(marker->data[11]) == 0x0;
|
|
}
|
|
|
|
|
|
/*
|
|
* See if there was an ICC profile in the JPEG file being read; if so,
|
|
* reassemble and return the profile data.
|
|
*
|
|
* TRUE is returned if an ICC profile was found, FALSE if not. If TRUE is
|
|
* returned, *icc_data_ptr is set to point to the returned data, and
|
|
* *icc_data_len is set to its length.
|
|
*
|
|
* IMPORTANT: the data at *icc_data_ptr is allocated with malloc() and must be
|
|
* freed by the caller with free() when the caller no longer needs it.
|
|
* (Alternatively, we could write this routine to use the IJG library's memory
|
|
* allocator, so that the data would be freed implicitly when
|
|
* jpeg_finish_decompress() is called. But it seems likely that many
|
|
* applications will prefer to have the data stick around after decompression
|
|
* finishes.)
|
|
*/
|
|
|
|
GLOBAL(boolean)
|
|
jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr,
|
|
unsigned int *icc_data_len)
|
|
{
|
|
jpeg_saved_marker_ptr marker;
|
|
int num_markers = 0;
|
|
int seq_no;
|
|
JOCTET *icc_data;
|
|
unsigned int total_length;
|
|
#define MAX_SEQ_NO 255 /* sufficient since marker numbers are bytes */
|
|
char marker_present[MAX_SEQ_NO + 1]; /* 1 if marker found */
|
|
unsigned int data_length[MAX_SEQ_NO + 1]; /* size of profile data in marker */
|
|
unsigned int data_offset[MAX_SEQ_NO + 1]; /* offset for data in marker */
|
|
|
|
if (icc_data_ptr == NULL || icc_data_len == NULL)
|
|
ERREXIT(cinfo, JERR_BUFFER_SIZE);
|
|
if (cinfo->global_state < DSTATE_READY)
|
|
ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
|
|
|
|
*icc_data_ptr = NULL; /* avoid confusion if FALSE return */
|
|
*icc_data_len = 0;
|
|
|
|
/* This first pass over the saved markers discovers whether there are
|
|
* any ICC markers and verifies the consistency of the marker numbering.
|
|
*/
|
|
|
|
for (seq_no = 1; seq_no <= MAX_SEQ_NO; seq_no++)
|
|
marker_present[seq_no] = 0;
|
|
|
|
for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
|
|
if (marker_is_icc(marker)) {
|
|
if (num_markers == 0)
|
|
num_markers = GETJOCTET(marker->data[13]);
|
|
else if (num_markers != GETJOCTET(marker->data[13])) {
|
|
WARNMS(cinfo, JWRN_BOGUS_ICC); /* inconsistent num_markers fields */
|
|
return FALSE;
|
|
}
|
|
seq_no = GETJOCTET(marker->data[12]);
|
|
if (seq_no <= 0 || seq_no > num_markers) {
|
|
WARNMS(cinfo, JWRN_BOGUS_ICC); /* bogus sequence number */
|
|
return FALSE;
|
|
}
|
|
if (marker_present[seq_no]) {
|
|
WARNMS(cinfo, JWRN_BOGUS_ICC); /* duplicate sequence numbers */
|
|
return FALSE;
|
|
}
|
|
marker_present[seq_no] = 1;
|
|
data_length[seq_no] = marker->data_length - ICC_OVERHEAD_LEN;
|
|
}
|
|
}
|
|
|
|
if (num_markers == 0)
|
|
return FALSE;
|
|
|
|
/* Check for missing markers, count total space needed,
|
|
* compute offset of each marker's part of the data.
|
|
*/
|
|
|
|
total_length = 0;
|
|
for (seq_no = 1; seq_no <= num_markers; seq_no++) {
|
|
if (marker_present[seq_no] == 0) {
|
|
WARNMS(cinfo, JWRN_BOGUS_ICC); /* missing sequence number */
|
|
return FALSE;
|
|
}
|
|
data_offset[seq_no] = total_length;
|
|
total_length += data_length[seq_no];
|
|
}
|
|
|
|
if (total_length == 0) {
|
|
WARNMS(cinfo, JWRN_BOGUS_ICC); /* found only empty markers? */
|
|
return FALSE;
|
|
}
|
|
|
|
/* Allocate space for assembled data */
|
|
icc_data = (JOCTET *)malloc(total_length * sizeof(JOCTET));
|
|
if (icc_data == NULL)
|
|
ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 11); /* oops, out of memory */
|
|
|
|
/* and fill it in */
|
|
for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
|
|
if (marker_is_icc(marker)) {
|
|
JOCTET FAR *src_ptr;
|
|
JOCTET *dst_ptr;
|
|
unsigned int length;
|
|
seq_no = GETJOCTET(marker->data[12]);
|
|
dst_ptr = icc_data + data_offset[seq_no];
|
|
src_ptr = marker->data + ICC_OVERHEAD_LEN;
|
|
length = data_length[seq_no];
|
|
while (length--) {
|
|
*dst_ptr++ = *src_ptr++;
|
|
}
|
|
}
|
|
}
|
|
|
|
*icc_data_ptr = icc_data;
|
|
*icc_data_len = total_length;
|
|
|
|
return TRUE;
|
|
}
|