diff options
| author | David Schleef <ds@schleef.org> | 2010-06-23 22:40:34 -0700 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2010-06-23 22:40:34 -0700 |
| commit | cc389994f6754b70616e18d1bdba5955475e72ce (patch) | |
| tree | fc012ede6b5e8f8d425751f25b5ebf5f9b6a6a67 | |
| parent | bddb964194cc95f3fea60aa97536bf2bf602b9e1 (diff) | |
| download | orc-pixman.tar.gz | |
merge fixespixman
| -rw-r--r-- | orc/orcopcodes.c | 14 | ||||
| -rw-r--r-- | orc/orcprogram.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/orc/orcopcodes.c b/orc/orcopcodes.c index 3be150a..e80a340 100644 --- a/orc/orcopcodes.c +++ b/orc/orcopcodes.c @@ -703,8 +703,8 @@ convlf (OrcOpcodeExecutor *ex, void *user) (ORC_CLAMP((r),0,255)<<16)|(ORC_CLAMP((a),0,255)<<24)) #define ORC_ARGB16(a,r,g,b) \ - (((uint64_t)ORC_CLAMP((b),0,65535)<<0)|((uint64_t)ORC_CLAMP((g),0,65535)<<16)| \ - ((uint64_t)ORC_CLAMP((r),0,65535)<<32)|((uint64_t)ORC_CLAMP((a),0,65535)<<48)) + (((orc_uint64)ORC_CLAMP((b),0,65535)<<0)|((orc_uint64)ORC_CLAMP((g),0,65535)<<16)| \ + ((orc_uint64)ORC_CLAMP((r),0,65535)<<32)|((orc_uint64)ORC_CLAMP((a),0,65535)<<48)) static void @@ -722,7 +722,7 @@ convubw4 (OrcOpcodeExecutor *ex, void *user) static void convwb4 (OrcOpcodeExecutor *ex, void *user) { - uint64_t src = ex->src_values[0]; + orc_uint64 src = ex->src_values[0]; ex->dest_values[0] = ORC_ARGB( ORC_ARGB16_A(src), @@ -734,7 +734,7 @@ convwb4 (OrcOpcodeExecutor *ex, void *user) static void div255w4 (OrcOpcodeExecutor *ex, void *user) { - uint64_t src = ex->src_values[0]; + orc_uint64 src = ex->src_values[0]; ex->dest_values[0] = ORC_ARGB16( ORC_DIVIDE_255(ORC_ARGB16_A(src)), @@ -746,7 +746,7 @@ div255w4 (OrcOpcodeExecutor *ex, void *user) static void splat0w4 (OrcOpcodeExecutor *ex, void *user) { - uint64_t src = ex->src_values[0]; + orc_uint64 src = ex->src_values[0]; ex->dest_values[0] = ORC_ARGB16( ORC_ARGB_A(src), @@ -758,8 +758,8 @@ splat0w4 (OrcOpcodeExecutor *ex, void *user) static void mullw4 (OrcOpcodeExecutor *ex, void *user) { - uint64_t src1 = ex->src_values[0]; - uint64_t src2 = ex->src_values[1]; + orc_uint64 src1 = ex->src_values[0]; + orc_uint64 src2 = ex->src_values[1]; ex->dest_values[0] = ORC_ARGB16( ORC_ARGB16_A(src1)*ORC_ARGB16_A(src2), diff --git a/orc/orcprogram.h b/orc/orcprogram.h index 9e3e9ba..bbd8301 100644 --- a/orc/orcprogram.h +++ b/orc/orcprogram.h @@ -438,8 +438,8 @@ struct _OrcCompiler { */ struct _OrcOpcodeExecutor { /*< private >*/ - int64_t src_values[ORC_STATIC_OPCODE_N_SRC]; - int64_t dest_values[ORC_STATIC_OPCODE_N_DEST]; + orc_int64 src_values[ORC_STATIC_OPCODE_N_SRC]; + orc_int64 dest_values[ORC_STATIC_OPCODE_N_DEST]; }; /** |