ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format preprocessor macros more consistently

Browse Source 
Within the libjpeg API code, it seems to be more the convention than not
to separate the macro name and value by two or more spaces, which
improves general readability.  Making this consistent across all of
libjpeg-turbo is less about my individual preferences and more about
making it easy to automatically detect variations from our chosen
formatting convention.  I intend to release the script I'm using to
validate this stuff, once it matures and stabilizes a bit.
This commit is contained in:
DRC
2018-03-17 15:14:35 -05:00
parent 09497c1a73
commit 293263c352
88 changed files with 1748 additions and 1685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jquant1.c
View File

@@ -74,7 +74,8 @@
#define ODITHER_SIZE 16 /* dimension of dither matrix */
/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
#define ODITHER_CELLS (ODITHER_SIZE * ODITHER_SIZE) /* # cells in matrix */
#define ODITHER_MASK (ODITHER_SIZE - 1) /* mask for wrapping around counters */
#define ODITHER_MASK (ODITHER_SIZE - 1) /* mask for wrapping around
counters */
typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];

6
jversion.h
View File

@@ -35,7 +35,8 @@
* their code
*/
#define JCOPYRIGHT "Copyright (C) 2009-2017 D. R. Commander\n" \
#define JCOPYRIGHT \
"Copyright (C) 2009-2017 D. R. Commander\n" \
"Copyright (C) 2011-2016 Siarhei Siamashka\n" \
"Copyright (C) 2015-2016 Matthieu Darbois\n" \
"Copyright (C) 2015 Intel Corporation\n" \
@@ -47,4 +48,5 @@
"Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
"Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding"
#define JCOPYRIGHT_SHORT "Copyright (C) 1991-2017 The libjpeg-turbo Project and many others"
#define JCOPYRIGHT_SHORT \
"Copyright (C) 1991-2017 The libjpeg-turbo Project and many others"

36
simd/i386/jdmerge-avx2.asm
View File

@@ -61,8 +61,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGB_GREEN
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extrgb_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extrgb_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -73,8 +75,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGBX_GREEN
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extrgbx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extrgbx_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extrgbx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extrgbx_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -85,8 +89,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGR_GREEN
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extbgr_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extbgr_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -97,8 +103,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGRX_GREEN
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extbgrx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extbgrx_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extbgrx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extbgrx_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -109,8 +117,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XBGR_GREEN
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extxbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extxbgr_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extxbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extxbgr_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -121,6 +131,8 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XRGB_GREEN
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extxrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extxrgb_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extxrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extxrgb_merged_upsample_avx2
%include "jdmrgext-avx2.asm"

36
simd/i386/jdmerge-sse2.asm
View File

@@ -60,8 +60,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGB_GREEN
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgb_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extrgb_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -72,8 +74,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGBX_GREEN
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgbx_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extrgbx_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -84,8 +88,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGR_GREEN
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgr_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extbgr_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -96,8 +102,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGRX_GREEN
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgrx_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extbgrx_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -108,8 +116,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XBGR_GREEN
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxbgr_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extxbgr_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -120,6 +130,8 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XRGB_GREEN
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxrgb_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extxrgb_merged_upsample_sse2
%include "jdmrgext-sse2.asm"

36
simd/powerpc/jdmerge-altivec.c
View File

@@ -46,8 +46,10 @@
#undef RGB_PIXELSIZE
#define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extrgb_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extrgb_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extrgb_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extrgb_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX0
@@ -59,8 +61,10 @@
#define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
#define RGB_INDEX \
{ 0, 1, 8, 9, 2, 3, 10, 11, 4, 5, 12, 13, 6, 7, 14, 15 }
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extrgbx_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extrgbx_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extrgbx_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extrgbx_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX
@@ -74,8 +78,10 @@
{ 3, 2, 12, 5, 4, 14, 7, 6, 24, 17, 16, 26, 19, 18, 28, 21 }
#define RGB_INDEX2 \
{ 4, 14, 7, 6, 24, 17, 16, 26, 19, 18, 28, 21, 20, 30, 23, 22 }
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extbgr_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extbgr_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extbgr_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extbgr_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX0
@@ -87,8 +93,10 @@
#define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
#define RGB_INDEX \
{ 8, 1, 0, 9, 10, 3, 2, 11, 12, 5, 4, 13, 14, 7, 6, 15 }
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extbgrx_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extbgrx_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extbgrx_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extbgrx_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX
@@ -98,8 +106,10 @@
#define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
#define RGB_INDEX \
{ 9, 8, 1, 0, 11, 10, 3, 2, 13, 12, 5, 4, 15, 14, 7, 6 }
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extxbgr_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extxbgr_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extxbgr_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extxbgr_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX
@@ -109,8 +119,10 @@
#define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
#define RGB_INDEX \
{ 9, 0, 1, 8, 11, 2, 3, 10, 13, 4, 5, 12, 15, 6, 7, 14 }
#define jsimd_h2v1_merged_upsample_altivec jsimd_h2v1_extxrgb_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec jsimd_h2v2_extxrgb_merged_upsample_altivec
#define jsimd_h2v1_merged_upsample_altivec \
jsimd_h2v1_extxrgb_merged_upsample_altivec
#define jsimd_h2v2_merged_upsample_altivec \
jsimd_h2v2_extxrgb_merged_upsample_altivec
#include "jdmrgext-altivec.c"
#undef RGB_PIXELSIZE
#undef RGB_INDEX

36
simd/x86_64/jdmerge-avx2.asm
View File

@@ -61,8 +61,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGB_GREEN
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extrgb_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extrgb_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -73,8 +75,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGBX_GREEN
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extrgbx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extrgbx_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extrgbx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extrgbx_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -85,8 +89,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGR_GREEN
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extbgr_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extbgr_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -97,8 +103,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGRX_GREEN
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extbgrx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extbgrx_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extbgrx_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extbgrx_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -109,8 +117,10 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XBGR_GREEN
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extxbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extxbgr_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extxbgr_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extxbgr_merged_upsample_avx2
%include "jdmrgext-avx2.asm"
%undef RGB_RED
@@ -121,6 +131,8 @@ PD_ONEHALF times 8 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XRGB_GREEN
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_avx2 jsimd_h2v1_extxrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 jsimd_h2v2_extxrgb_merged_upsample_avx2
%define jsimd_h2v1_merged_upsample_avx2 \
jsimd_h2v1_extxrgb_merged_upsample_avx2
%define jsimd_h2v2_merged_upsample_avx2 \
jsimd_h2v2_extxrgb_merged_upsample_avx2
%include "jdmrgext-avx2.asm"

36
simd/x86_64/jdmerge-sse2.asm
View File

@@ -60,8 +60,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGB_GREEN
%define RGB_BLUE EXT_RGB_BLUE
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgb_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extrgb_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -72,8 +74,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_RGBX_GREEN
%define RGB_BLUE EXT_RGBX_BLUE
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgbx_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extrgbx_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -84,8 +88,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGR_GREEN
%define RGB_BLUE EXT_BGR_BLUE
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgr_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extbgr_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -96,8 +102,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_BGRX_GREEN
%define RGB_BLUE EXT_BGRX_BLUE
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgrx_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extbgrx_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -108,8 +116,10 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XBGR_GREEN
%define RGB_BLUE EXT_XBGR_BLUE
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxbgr_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extxbgr_merged_upsample_sse2
%include "jdmrgext-sse2.asm"
%undef RGB_RED
@@ -120,6 +130,8 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS - 1)
%define RGB_GREEN EXT_XRGB_GREEN
%define RGB_BLUE EXT_XRGB_BLUE
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxrgb_merged_upsample_sse2
%define jsimd_h2v1_merged_upsample_sse2 \
jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 \
jsimd_h2v2_extxrgb_merged_upsample_sse2
%include "jdmrgext-sse2.asm"