| Index: simd/jccolor-mmx.asm
 | 
| diff --git a/simd/jccolmmx.asm b/simd/jccolor-mmx.asm
 | 
| similarity index 67%
 | 
| rename from simd/jccolmmx.asm
 | 
| rename to simd/jccolor-mmx.asm
 | 
| index 1867abef0991f1d7293a3276d2f567df16190498..c5d376443d72ab8504bfdc2eef28407ccb7cf441 100644
 | 
| --- a/simd/jccolmmx.asm
 | 
| +++ b/simd/jccolor-mmx.asm
 | 
| @@ -1,5 +1,5 @@
 | 
|  ;
 | 
| -; jccolmmx.asm - colorspace conversion (MMX)
 | 
| +; jccolor.asm - colorspace conversion (MMX)
 | 
|  ;
 | 
|  ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
 | 
|  ; Copyright 2009 D. R. Commander
 | 
| @@ -21,40 +21,40 @@
 | 
|  
 | 
|  ; --------------------------------------------------------------------------
 | 
|  
 | 
| -%define SCALEBITS	16
 | 
| +%define SCALEBITS       16
 | 
|  
 | 
| -F_0_081	equ	 5329			; FIX(0.08131)
 | 
| -F_0_114	equ	 7471			; FIX(0.11400)
 | 
| -F_0_168	equ	11059			; FIX(0.16874)
 | 
| -F_0_250	equ	16384			; FIX(0.25000)
 | 
| -F_0_299	equ	19595			; FIX(0.29900)
 | 
| -F_0_331	equ	21709			; FIX(0.33126)
 | 
| -F_0_418	equ	27439			; FIX(0.41869)
 | 
| -F_0_587	equ	38470			; FIX(0.58700)
 | 
| -F_0_337	equ	(F_0_587 - F_0_250)	; FIX(0.58700) - FIX(0.25000)
 | 
| +F_0_081 equ      5329                   ; FIX(0.08131)
 | 
| +F_0_114 equ      7471                   ; FIX(0.11400)
 | 
| +F_0_168 equ     11059                   ; FIX(0.16874)
 | 
| +F_0_250 equ     16384                   ; FIX(0.25000)
 | 
| +F_0_299 equ     19595                   ; FIX(0.29900)
 | 
| +F_0_331 equ     21709                   ; FIX(0.33126)
 | 
| +F_0_418 equ     27439                   ; FIX(0.41869)
 | 
| +F_0_587 equ     38470                   ; FIX(0.58700)
 | 
| +F_0_337 equ     (F_0_587 - F_0_250)     ; FIX(0.58700) - FIX(0.25000)
 | 
|  
 | 
|  ; --------------------------------------------------------------------------
 | 
| -	SECTION	SEG_CONST
 | 
| +        SECTION SEG_CONST
 | 
|  
 | 
| -	alignz	16
 | 
| -	global	EXTN(jconst_rgb_ycc_convert_mmx) PRIVATE
 | 
| +        alignz  16
 | 
| +        global  EXTN(jconst_rgb_ycc_convert_mmx)
 | 
|  
 | 
|  EXTN(jconst_rgb_ycc_convert_mmx):
 | 
|  
 | 
| -PW_F0299_F0337	times 2 dw  F_0_299, F_0_337
 | 
| -PW_F0114_F0250	times 2 dw  F_0_114, F_0_250
 | 
| -PW_MF016_MF033	times 2 dw -F_0_168,-F_0_331
 | 
| -PW_MF008_MF041	times 2 dw -F_0_081,-F_0_418
 | 
| -PD_ONEHALFM1_CJ	times 2 dd  (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS)
 | 
| -PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
| +PW_F0299_F0337  times 2 dw  F_0_299, F_0_337
 | 
| +PW_F0114_F0250  times 2 dw  F_0_114, F_0_250
 | 
| +PW_MF016_MF033  times 2 dw -F_0_168,-F_0_331
 | 
| +PW_MF008_MF041  times 2 dw -F_0_081,-F_0_418
 | 
| +PD_ONEHALFM1_CJ times 2 dd  (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS)
 | 
| +PD_ONEHALF      times 2 dd  (1 << (SCALEBITS-1))
 | 
|  
 | 
| -	alignz	16
 | 
| +        alignz  16
 | 
|  
 | 
|  ; --------------------------------------------------------------------------
 | 
| -	SECTION	SEG_TEXT
 | 
| -	BITS	32
 | 
| +        SECTION SEG_TEXT
 | 
| +        BITS    32
 | 
|  
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -65,7 +65,7 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_RGB_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extrgb_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -76,7 +76,7 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_RGBX_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extrgbx_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -87,7 +87,7 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_BGR_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extbgr_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -98,7 +98,7 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_BGRX_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extbgrx_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -109,7 +109,7 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_XBGR_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extxbgr_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
|  
 | 
|  %undef RGB_RED
 | 
|  %undef RGB_GREEN
 | 
| @@ -120,4 +120,4 @@ PD_ONEHALF	times 2 dd  (1 << (SCALEBITS-1))
 | 
|  %define RGB_BLUE EXT_XRGB_BLUE
 | 
|  %define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
 | 
|  %define jsimd_rgb_ycc_convert_mmx jsimd_extxrgb_ycc_convert_mmx
 | 
| -%include "jcclrmmx.asm"
 | 
| +%include "jccolext-mmx.asm"
 | 
| 
 |