Attachment #419156: patch v1 for bug #536725

View | Details | Raw Unified | Return to bug 536725
Collapse All | Expand All

(-)a/gfx/qcms/Makefile.in (+4 lines)
Line     Link Here 
 Lines 11-40   LIBXUL_LIBRARY = 1 Link Here 
11
GRE_MODULE      = 1
11
GRE_MODULE      = 1
12
DIST_INSTALL = 1
12
DIST_INSTALL = 1
13
13
14
EXPORTS      = qcms.h qcmstypes.h
14
EXPORTS      = qcms.h qcmstypes.h
15
15
16
CSRCS = iccread.c transform.c
16
CSRCS = iccread.c transform.c
17
17
18
ifeq (86,$(findstring 86,$(OS_TEST)))
18
ifeq (86,$(findstring 86,$(OS_TEST)))
19
ifeq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64)
20
	CSRCS += transform-sse2.c
21
else
19
	CSRCS += transform-sse2.c transform-sse1.c
22
	CSRCS += transform-sse2.c transform-sse1.c
20
ifdef GNU_CC
23
ifdef GNU_CC
21
	SSE1_FLAGS=-msse
24
	SSE1_FLAGS=-msse
22
	SSE2_FLAGS=-msse2
25
	SSE2_FLAGS=-msse2
23
else
26
else
24
ifeq ($(SOLARIS_SUNPRO_CC),1)
27
ifeq ($(SOLARIS_SUNPRO_CC),1)
25
	SSE1_FLAGS=-xarch=sse
28
	SSE1_FLAGS=-xarch=sse
26
	SSE2_FLAGS=-xarch=sse2
29
	SSE2_FLAGS=-xarch=sse2
27
else
30
else
28
	SSE1_FLAGS=
31
	SSE1_FLAGS=
29
	SSE2_FLAGS=
32
	SSE2_FLAGS=
30
endif
33
endif
31
endif
34
endif
32
endif
35
endif
36
endif
33
37
34
FORCE_STATIC_LIB = 1
38
FORCE_STATIC_LIB = 1
35
# This library is used by other shared libs
39
# This library is used by other shared libs
36
FORCE_USE_PIC = 1
40
FORCE_USE_PIC = 1
37
41
38
include $(topsrcdir)/config/rules.mk
42
include $(topsrcdir)/config/rules.mk
39
43
40
CFLAGS          += -DMOZ_QCMS
44
CFLAGS          += -DMOZ_QCMS
(-)a/gfx/qcms/transform.c (-1 / +2 lines)
Line     Link Here 
 Lines 1221-1243   qcms_transform* qcms_transform_create( Link Here 
1221
	    if (precache) {
1221
	    if (precache) {
1222
#ifdef X86
1222
#ifdef X86
1223
		    if (sse_version_available() >= 2) {
1223
		    if (sse_version_available() >= 2) {
1224
			    if (in_type == QCMS_DATA_RGB_8)
1224
			    if (in_type == QCMS_DATA_RGB_8)
1225
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_sse2;
1225
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_sse2;
1226
			    else
1226
			    else
1227
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_sse2;
1227
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_sse2;
1228
1228
1229
#if !(defined(_MSC_VER) && defined(_M_AMD64))
1229
		    } else
1230
		    } else
1230
		    if (sse_version_available() >= 1) {
1231
		    if (sse_version_available() >= 1) {
1231
			    if (in_type == QCMS_DATA_RGB_8)
1232
			    if (in_type == QCMS_DATA_RGB_8)
1232
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_sse1;
1233
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_sse1;
1233
			    else
1234
			    else
1234
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_sse1;
1235
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_sse1;
1235
1236
#endif
1236
		    } else
1237
		    } else
1237
#endif
1238
#endif
1238
		    {
1239
		    {
1239
			    if (in_type == QCMS_DATA_RGB_8)
1240
			    if (in_type == QCMS_DATA_RGB_8)
1240
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_precache;
1241
				    transform->transform_fn = qcms_transform_data_rgb_out_lut_precache;
1241
			    else
1242
			    else
1242
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_precache;
1243
				    transform->transform_fn = qcms_transform_data_rgba_out_lut_precache;
1243
		    }
1244
		    }

Return to bug 536725