+++ /dev/null
-From 44bce1b66c1cdd5308ac3ac773ea0a53d83790fd Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Tue, 24 Nov 2015 21:16:39 +0100
-Subject: [PATCH] LibWebP: fix compilation issue with GCC 5.x / C++11
-
-GCC 5.1 / C++11 gets confused about the "#<TEXT>" in the inline assembly
-code, and dies with errors like:
-
-Source/LibWebP/./src/dsp/dsp.upsampling_mips_dsp_r2.c:37:34: error: invalid
-character ' ' in raw string delimiter
-
-Fix it by introducting white space around the string literals like it has
-been done in upstream webp:
-
-https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef
-
-Discussed upstream:
-http://sourceforge.net/p/freeimage/discussion/36110/thread/605ef8e4/
-
-[Scripted by sed -i 's/"\(#[A-Z0-9]*\)"/" \1 "/g' *.c]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c | 28 +-
- Source/LibWebP/src/dsp/dsp.enc_mips32.c | 314 ++++++++++-----------
- Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c | 288 +++++++++----------
- Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c | 10 +-
- Source/LibWebP/src/dsp/dsp.lossless_mips32.c | 34 +--
- Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c | 8 +-
- .../LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c | 18 +-
- Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c | 10 +-
- 8 files changed, 355 insertions(+), 355 deletions(-)
-
-diff --git a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-index dac2c93..aaa8111 100644
---- a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-@@ -548,10 +548,10 @@ static void SimpleVFilter16(uint8_t* p, int stride, int thresh) {
- // TEMP3 = SRC[D + D1 * BPS]\r
- #define LOAD_4_BYTES(TEMP0, TEMP1, TEMP2, TEMP3, \\r
- A, A1, B, B1, C, C1, D, D1, SRC) \\r
-- "lbu %["#TEMP0"], "#A"+"#A1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \\r
-- "lbu %["#TEMP1"], "#B"+"#B1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \\r
-- "lbu %["#TEMP2"], "#C"+"#C1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \\r
-- "lbu %["#TEMP3"], "#D"+"#D1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \\r
-+ "lbu %[" #TEMP0 "], " #A "+" #A1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \\r
-+ "lbu %[" #TEMP1 "], " #B "+" #B1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \\r
-+ "lbu %[" #TEMP2 "], " #C "+" #C1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \\r
-+ "lbu %[" #TEMP3 "], " #D "+" #D1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \\r
- \r
- static void SimpleHFilter16(uint8_t* p, int stride, int thresh) {\r
- int i;\r
-@@ -623,8 +623,8 @@ static void SimpleHFilter16i(uint8_t* p, int stride, int thresh) {
- // DST[A * BPS] = TEMP0\r
- // DST[B + C * BPS] = TEMP1\r
- #define STORE_8_BYTES(TEMP0, TEMP1, A, B, C, DST) \\r
-- "usw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#DST"]) \n\t" \\r
-- "usw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#DST"]) \n\t"\r
-+ "usw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #DST "]) \n\t" \\r
-+ "usw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #DST "]) \n\t"\r
- \r
- static void VE4(uint8_t* dst) { // vertical\r
- const uint8_t* top = dst - BPS;\r
-@@ -725,8 +725,8 @@ static void RD4(uint8_t* dst) { // Down-right
- // TEMP0 = SRC[A * BPS]\r
- // TEMP1 = SRC[B + C * BPS]\r
- #define LOAD_8_BYTES(TEMP0, TEMP1, A, B, C, SRC) \\r
-- "ulw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#SRC"]) \n\t" \\r
-- "ulw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#SRC"]) \n\t"\r
-+ "ulw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \\r
-+ "ulw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #SRC "]) \n\t"\r
- \r
- static void LD4(uint8_t* dst) { // Down-Left\r
- int temp0, temp1, temp2, temp3, temp4;\r
-@@ -873,24 +873,24 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples
- #define CLIPPING(SIZE) \\r
- "preceu.ph.qbl %[temp2], %[temp0] \n\t" \\r
- "preceu.ph.qbr %[temp0], %[temp0] \n\t" \\r
--".if "#SIZE" == 8 \n\t" \\r
-+".if " #SIZE " == 8 \n\t" \\r
- "preceu.ph.qbl %[temp3], %[temp1] \n\t" \\r
- "preceu.ph.qbr %[temp1], %[temp1] \n\t" \\r
- ".endif \n\t" \\r
- "addu.ph %[temp2], %[temp2], %[dst_1] \n\t" \\r
- "addu.ph %[temp0], %[temp0], %[dst_1] \n\t" \\r
--".if "#SIZE" == 8 \n\t" \\r
-+".if " #SIZE " == 8 \n\t" \\r
- "addu.ph %[temp3], %[temp3], %[dst_1] \n\t" \\r
- "addu.ph %[temp1], %[temp1], %[dst_1] \n\t" \\r
- ".endif \n\t" \\r
- "shll_s.ph %[temp2], %[temp2], 7 \n\t" \\r
- "shll_s.ph %[temp0], %[temp0], 7 \n\t" \\r
--".if "#SIZE" == 8 \n\t" \\r
-+".if " #SIZE " == 8 \n\t" \\r
- "shll_s.ph %[temp3], %[temp3], 7 \n\t" \\r
- "shll_s.ph %[temp1], %[temp1], 7 \n\t" \\r
- ".endif \n\t" \\r
- "precrqu_s.qb.ph %[temp0], %[temp2], %[temp0] \n\t" \\r
--".if "#SIZE" == 8 \n\t" \\r
-+".if " #SIZE " == 8 \n\t" \\r
- "precrqu_s.qb.ph %[temp1], %[temp3], %[temp1] \n\t" \\r
- ".endif \n\t"\r
- \r
-@@ -899,7 +899,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples
- int dst_1 = ((int)(DST)[-1] << 16) + (DST)[-1]; \\r
- int temp0, temp1, temp2, temp3; \\r
- __asm__ volatile ( \\r
-- ".if "#SIZE" < 8 \n\t" \\r
-+ ".if " #SIZE " < 8 \n\t" \\r
- "ulw %[temp0], 0(%[top]) \n\t" \\r
- "subu.ph %[dst_1], %[dst_1], %[top_1] \n\t" \\r
- CLIPPING(4) \\r
-@@ -911,7 +911,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples
- CLIPPING(8) \\r
- "usw %[temp0], 0(%[dst]) \n\t" \\r
- "usw %[temp1], 4(%[dst]) \n\t" \\r
-- ".if "#SIZE" == 16 \n\t" \\r
-+ ".if " #SIZE " == 16 \n\t" \\r
- "ulw %[temp0], 8(%[top]) \n\t" \\r
- "ulw %[temp1], 12(%[top]) \n\t" \\r
- CLIPPING(8) \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips32.c b/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-index 545aa3a..bf1c16d 100644
---- a/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-+++ b/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-@@ -31,26 +31,26 @@ static const int kC2 = 35468;
- // TEMP0..TEMP3 - registers for corresponding tmp elements\r
- // TEMP4..TEMP5 - temporary registers\r
- #define VERTICAL_PASS(A, B, C, D, TEMP4, TEMP0, TEMP1, TEMP2, TEMP3) \\r
-- "lh %[temp16], "#A"(%[temp20]) \n\t" \\r
-- "lh %[temp18], "#B"(%[temp20]) \n\t" \\r
-- "lh %[temp17], "#C"(%[temp20]) \n\t" \\r
-- "lh %[temp19], "#D"(%[temp20]) \n\t" \\r
-- "addu %["#TEMP4"], %[temp16], %[temp18] \n\t" \\r
-+ "lh %[temp16], " #A "(%[temp20]) \n\t" \\r
-+ "lh %[temp18], " #B "(%[temp20]) \n\t" \\r
-+ "lh %[temp17], " #C "(%[temp20]) \n\t" \\r
-+ "lh %[temp19], " #D "(%[temp20]) \n\t" \\r
-+ "addu %[" #TEMP4 "], %[temp16], %[temp18] \n\t" \\r
- "subu %[temp16], %[temp16], %[temp18] \n\t" \\r
-- "mul %["#TEMP0"], %[temp17], %[kC2] \n\t" \\r
-+ "mul %[" #TEMP0 "], %[temp17], %[kC2] \n\t" \\r
- "mul %[temp18], %[temp19], %[kC1] \n\t" \\r
- "mul %[temp17], %[temp17], %[kC1] \n\t" \\r
- "mul %[temp19], %[temp19], %[kC2] \n\t" \\r
-- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\n" \\r
-+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\n" \\r
- "sra %[temp18], %[temp18], 16 \n\n" \\r
- "sra %[temp17], %[temp17], 16 \n\n" \\r
- "sra %[temp19], %[temp19], 16 \n\n" \\r
-- "subu %["#TEMP2"], %["#TEMP0"], %[temp18] \n\t" \\r
-- "addu %["#TEMP3"], %[temp17], %[temp19] \n\t" \\r
-- "addu %["#TEMP0"], %["#TEMP4"], %["#TEMP3"] \n\t" \\r
-- "addu %["#TEMP1"], %[temp16], %["#TEMP2"] \n\t" \\r
-- "subu %["#TEMP2"], %[temp16], %["#TEMP2"] \n\t" \\r
-- "subu %["#TEMP3"], %["#TEMP4"], %["#TEMP3"] \n\t"\r
-+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp18] \n\t" \\r
-+ "addu %[" #TEMP3 "], %[temp17], %[temp19] \n\t" \\r
-+ "addu %[" #TEMP0 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t" \\r
-+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP2 "] \n\t" \\r
-+ "subu %[" #TEMP2 "], %[temp16], %[" #TEMP2 "] \n\t" \\r
-+ "subu %[" #TEMP3 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t"\r
- \r
- // macro for one horizontal pass in ITransformOne\r
- // MUL and STORE macros inlined\r
-@@ -59,58 +59,58 @@ static const int kC2 = 35468;
- // A - offset in bytes to load from ref and store to dst buffer\r
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements\r
- #define HORIZONTAL_PASS(A, TEMP0, TEMP4, TEMP8, TEMP12) \\r
-- "addiu %["#TEMP0"], %["#TEMP0"], 4 \n\t" \\r
-- "addu %[temp16], %["#TEMP0"], %["#TEMP8"] \n\t" \\r
-- "subu %[temp17], %["#TEMP0"], %["#TEMP8"] \n\t" \\r
-- "mul %["#TEMP0"], %["#TEMP4"], %[kC2] \n\t" \\r
-- "mul %["#TEMP8"], %["#TEMP12"], %[kC1] \n\t" \\r
-- "mul %["#TEMP4"], %["#TEMP4"], %[kC1] \n\t" \\r
-- "mul %["#TEMP12"], %["#TEMP12"], %[kC2] \n\t" \\r
-- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\t" \\r
-- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \\r
-- "sra %["#TEMP4"], %["#TEMP4"], 16 \n\t" \\r
-- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \\r
-- "subu %[temp18], %["#TEMP0"], %["#TEMP8"] \n\t" \\r
-- "addu %[temp19], %["#TEMP4"], %["#TEMP12"] \n\t" \\r
-- "addu %["#TEMP0"], %[temp16], %[temp19] \n\t" \\r
-- "addu %["#TEMP4"], %[temp17], %[temp18] \n\t" \\r
-- "subu %["#TEMP8"], %[temp17], %[temp18] \n\t" \\r
-- "subu %["#TEMP12"], %[temp16], %[temp19] \n\t" \\r
-+ "addiu %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \\r
-+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \\r
-+ "subu %[temp17], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \\r
-+ "mul %[" #TEMP0 "], %[" #TEMP4 "], %[kC2] \n\t" \\r
-+ "mul %[" #TEMP8 "], %[" #TEMP12 "], %[kC1] \n\t" \\r
-+ "mul %[" #TEMP4 "], %[" #TEMP4 "], %[kC1] \n\t" \\r
-+ "mul %[" #TEMP12 "], %[" #TEMP12 "], %[kC2] \n\t" \\r
-+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \\r
-+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \\r
-+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 16 \n\t" \\r
-+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \\r
-+ "subu %[temp18], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \\r
-+ "addu %[temp19], %[" #TEMP4 "], %[" #TEMP12 "] \n\t" \\r
-+ "addu %[" #TEMP0 "], %[temp16], %[temp19] \n\t" \\r
-+ "addu %[" #TEMP4 "], %[temp17], %[temp18] \n\t" \\r
-+ "subu %[" #TEMP8 "], %[temp17], %[temp18] \n\t" \\r
-+ "subu %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \\r
- "lw %[temp20], 0(%[args]) \n\t" \\r
-- "sra %["#TEMP0"], %["#TEMP0"], 3 \n\t" \\r
-- "sra %["#TEMP4"], %["#TEMP4"], 3 \n\t" \\r
-- "sra %["#TEMP8"], %["#TEMP8"], 3 \n\t" \\r
-- "sra %["#TEMP12"], %["#TEMP12"], 3 \n\t" \\r
-- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \\r
-- "lbu %[temp17], 1+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \\r
-- "lbu %[temp18], 2+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \\r
-- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \\r
-- "addu %["#TEMP0"], %[temp16], %["#TEMP0"] \n\t" \\r
-- "addu %["#TEMP4"], %[temp17], %["#TEMP4"] \n\t" \\r
-- "addu %["#TEMP8"], %[temp18], %["#TEMP8"] \n\t" \\r
-- "addu %["#TEMP12"], %[temp19], %["#TEMP12"] \n\t" \\r
-- "slt %[temp16], %["#TEMP0"], $zero \n\t" \\r
-- "slt %[temp17], %["#TEMP4"], $zero \n\t" \\r
-- "slt %[temp18], %["#TEMP8"], $zero \n\t" \\r
-- "slt %[temp19], %["#TEMP12"], $zero \n\t" \\r
-- "movn %["#TEMP0"], $zero, %[temp16] \n\t" \\r
-- "movn %["#TEMP4"], $zero, %[temp17] \n\t" \\r
-- "movn %["#TEMP8"], $zero, %[temp18] \n\t" \\r
-- "movn %["#TEMP12"], $zero, %[temp19] \n\t" \\r
-+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \\r
-+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 3 \n\t" \\r
-+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 3 \n\t" \\r
-+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 3 \n\t" \\r
-+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \\r
-+ "lbu %[temp17], 1+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \\r
-+ "lbu %[temp18], 2+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \\r
-+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \\r
-+ "addu %[" #TEMP0 "], %[temp16], %[" #TEMP0 "] \n\t" \\r
-+ "addu %[" #TEMP4 "], %[temp17], %[" #TEMP4 "] \n\t" \\r
-+ "addu %[" #TEMP8 "], %[temp18], %[" #TEMP8 "] \n\t" \\r
-+ "addu %[" #TEMP12 "], %[temp19], %[" #TEMP12 "] \n\t" \\r
-+ "slt %[temp16], %[" #TEMP0 "], $zero \n\t" \\r
-+ "slt %[temp17], %[" #TEMP4 "], $zero \n\t" \\r
-+ "slt %[temp18], %[" #TEMP8 "], $zero \n\t" \\r
-+ "slt %[temp19], %[" #TEMP12 "], $zero \n\t" \\r
-+ "movn %[" #TEMP0 "], $zero, %[temp16] \n\t" \\r
-+ "movn %[" #TEMP4 "], $zero, %[temp17] \n\t" \\r
-+ "movn %[" #TEMP8 "], $zero, %[temp18] \n\t" \\r
-+ "movn %[" #TEMP12 "], $zero, %[temp19] \n\t" \\r
- "addiu %[temp20], $zero, 255 \n\t" \\r
-- "slt %[temp16], %["#TEMP0"], %[temp20] \n\t" \\r
-- "slt %[temp17], %["#TEMP4"], %[temp20] \n\t" \\r
-- "slt %[temp18], %["#TEMP8"], %[temp20] \n\t" \\r
-- "slt %[temp19], %["#TEMP12"], %[temp20] \n\t" \\r
-- "movz %["#TEMP0"], %[temp20], %[temp16] \n\t" \\r
-- "movz %["#TEMP4"], %[temp20], %[temp17] \n\t" \\r
-+ "slt %[temp16], %[" #TEMP0 "], %[temp20] \n\t" \\r
-+ "slt %[temp17], %[" #TEMP4 "], %[temp20] \n\t" \\r
-+ "slt %[temp18], %[" #TEMP8 "], %[temp20] \n\t" \\r
-+ "slt %[temp19], %[" #TEMP12 "], %[temp20] \n\t" \\r
-+ "movz %[" #TEMP0 "], %[temp20], %[temp16] \n\t" \\r
-+ "movz %[" #TEMP4 "], %[temp20], %[temp17] \n\t" \\r
- "lw %[temp16], 8(%[args]) \n\t" \\r
-- "movz %["#TEMP8"], %[temp20], %[temp18] \n\t" \\r
-- "movz %["#TEMP12"], %[temp20], %[temp19] \n\t" \\r
-- "sb %["#TEMP0"], 0+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \\r
-- "sb %["#TEMP4"], 1+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \\r
-- "sb %["#TEMP8"], 2+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \\r
-- "sb %["#TEMP12"], 3+"XSTR(BPS)"*"#A"(%[temp16]) \n\t"\r
-+ "movz %[" #TEMP8 "], %[temp20], %[temp18] \n\t" \\r
-+ "movz %[" #TEMP12 "], %[temp20], %[temp19] \n\t" \\r
-+ "sb %[" #TEMP0 "], 0+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \\r
-+ "sb %[" #TEMP4 "], 1+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \\r
-+ "sb %[" #TEMP8 "], 2+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \\r
-+ "sb %[" #TEMP12 "], 3+"XSTR(BPS)"*" #A "(%[temp16]) \n\t"\r
- \r
- // Does one or two inverse transforms.\r
- static WEBP_INLINE void ITransformOne(const uint8_t* ref, const int16_t* in,\r
-@@ -161,9 +161,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in,
- // K - offset in bytes (kZigzag[n] * 4)\r
- // N - offset in bytes (n * 2)\r
- #define QUANTIZE_ONE(J, K, N) \\r
-- "lh %[temp0], "#J"(%[ppin]) \n\t" \\r
-- "lhu %[temp1], "#J"(%[ppsharpen]) \n\t" \\r
-- "lw %[temp2], "#K"(%[ppzthresh]) \n\t" \\r
-+ "lh %[temp0], " #J "(%[ppin]) \n\t" \\r
-+ "lhu %[temp1], " #J "(%[ppsharpen]) \n\t" \\r
-+ "lw %[temp2], " #K "(%[ppzthresh]) \n\t" \\r
- "sra %[sign], %[temp0], 15 \n\t" \\r
- "xor %[coeff], %[temp0], %[sign] \n\t" \\r
- "subu %[coeff], %[coeff], %[sign] \n\t" \\r
-@@ -172,9 +172,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in,
- "addiu %[temp5], $zero, 0 \n\t" \\r
- "addiu %[level], $zero, 0 \n\t" \\r
- "beqz %[temp4], 2f \n\t" \\r
-- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \\r
-- "lw %[temp2], "#K"(%[ppbias]) \n\t" \\r
-- "lhu %[temp3], "#J"(%[ppq]) \n\t" \\r
-+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \\r
-+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \\r
-+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \\r
- "mul %[level], %[coeff], %[temp1] \n\t" \\r
- "addu %[level], %[level], %[temp2] \n\t" \\r
- "sra %[level], %[level], 17 \n\t" \\r
-@@ -184,8 +184,8 @@ static void ITransform(const uint8_t* ref, const int16_t* in,
- "subu %[level], %[level], %[sign] \n\t" \\r
- "mul %[temp5], %[level], %[temp3] \n\t" \\r
- "2: \n\t" \\r
-- "sh %[temp5], "#J"(%[ppin]) \n\t" \\r
-- "sh %[level], "#N"(%[pout]) \n\t"\r
-+ "sh %[temp5], " #J "(%[ppin]) \n\t" \\r
-+ "sh %[level], " #N "(%[pout]) \n\t"\r
- \r
- static int QuantizeBlock(int16_t in[16], int16_t out[16],\r
- const VP8Matrix* const mtx) {\r
-@@ -254,14 +254,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32],
- // E..H - offsets in bytes to store first results to tmp buffer\r
- // E1..H1 - offsets in bytes to store second results to tmp buffer\r
- #define HORIZONTAL_PASS(A, E, F, G, H, E1, F1, G1, H1) \\r
-- "lbu %[temp0], 0+"XSTR(BPS)"*"#A"(%[a]) \n\t" \\r
-- "lbu %[temp1], 1+"XSTR(BPS)"*"#A"(%[a]) \n\t" \\r
-- "lbu %[temp2], 2+"XSTR(BPS)"*"#A"(%[a]) \n\t" \\r
-- "lbu %[temp3], 3+"XSTR(BPS)"*"#A"(%[a]) \n\t" \\r
-- "lbu %[temp4], 0+"XSTR(BPS)"*"#A"(%[b]) \n\t" \\r
-- "lbu %[temp5], 1+"XSTR(BPS)"*"#A"(%[b]) \n\t" \\r
-- "lbu %[temp6], 2+"XSTR(BPS)"*"#A"(%[b]) \n\t" \\r
-- "lbu %[temp7], 3+"XSTR(BPS)"*"#A"(%[b]) \n\t" \\r
-+ "lbu %[temp0], 0+"XSTR(BPS)"*" #A "(%[a]) \n\t" \\r
-+ "lbu %[temp1], 1+"XSTR(BPS)"*" #A "(%[a]) \n\t" \\r
-+ "lbu %[temp2], 2+"XSTR(BPS)"*" #A "(%[a]) \n\t" \\r
-+ "lbu %[temp3], 3+"XSTR(BPS)"*" #A "(%[a]) \n\t" \\r
-+ "lbu %[temp4], 0+"XSTR(BPS)"*" #A "(%[b]) \n\t" \\r
-+ "lbu %[temp5], 1+"XSTR(BPS)"*" #A "(%[b]) \n\t" \\r
-+ "lbu %[temp6], 2+"XSTR(BPS)"*" #A "(%[b]) \n\t" \\r
-+ "lbu %[temp7], 3+"XSTR(BPS)"*" #A "(%[b]) \n\t" \\r
- "addu %[temp8], %[temp0], %[temp2] \n\t" \\r
- "subu %[temp0], %[temp0], %[temp2] \n\t" \\r
- "addu %[temp2], %[temp1], %[temp3] \n\t" \\r
-@@ -278,14 +278,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32],
- "subu %[temp3], %[temp3], %[temp6] \n\t" \\r
- "addu %[temp6], %[temp4], %[temp5] \n\t" \\r
- "subu %[temp4], %[temp4], %[temp5] \n\t" \\r
-- "sw %[temp7], "#E"(%[tmp]) \n\t" \\r
-- "sw %[temp2], "#H"(%[tmp]) \n\t" \\r
-- "sw %[temp8], "#F"(%[tmp]) \n\t" \\r
-- "sw %[temp0], "#G"(%[tmp]) \n\t" \\r
-- "sw %[temp1], "#E1"(%[tmp]) \n\t" \\r
-- "sw %[temp3], "#H1"(%[tmp]) \n\t" \\r
-- "sw %[temp6], "#F1"(%[tmp]) \n\t" \\r
-- "sw %[temp4], "#G1"(%[tmp]) \n\t"\r
-+ "sw %[temp7], " #E "(%[tmp]) \n\t" \\r
-+ "sw %[temp2], " #H "(%[tmp]) \n\t" \\r
-+ "sw %[temp8], " #F "(%[tmp]) \n\t" \\r
-+ "sw %[temp0], " #G "(%[tmp]) \n\t" \\r
-+ "sw %[temp1], " #E1 "(%[tmp]) \n\t" \\r
-+ "sw %[temp3], " #H1 "(%[tmp]) \n\t" \\r
-+ "sw %[temp6], " #F1 "(%[tmp]) \n\t" \\r
-+ "sw %[temp4], " #G1 "(%[tmp]) \n\t"\r
- \r
- // macro for one vertical pass in Disto4x4 (TTransform)\r
- // two calls of function TTransform are merged into single one\r
-@@ -300,10 +300,10 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32],
- // A1..D1 - offsets in bytes to load second results from tmp buffer\r
- // E..H - offsets in bytes to load from w buffer\r
- #define VERTICAL_PASS(A, B, C, D, A1, B1, C1, D1, E, F, G, H) \\r
-- "lw %[temp0], "#A1"(%[tmp]) \n\t" \\r
-- "lw %[temp1], "#C1"(%[tmp]) \n\t" \\r
-- "lw %[temp2], "#B1"(%[tmp]) \n\t" \\r
-- "lw %[temp3], "#D1"(%[tmp]) \n\t" \\r
-+ "lw %[temp0], " #A1 "(%[tmp]) \n\t" \\r
-+ "lw %[temp1], " #C1 "(%[tmp]) \n\t" \\r
-+ "lw %[temp2], " #B1 "(%[tmp]) \n\t" \\r
-+ "lw %[temp3], " #D1 "(%[tmp]) \n\t" \\r
- "addu %[temp8], %[temp0], %[temp1] \n\t" \\r
- "subu %[temp0], %[temp0], %[temp1] \n\t" \\r
- "addu %[temp1], %[temp2], %[temp3] \n\t" \\r
-@@ -324,18 +324,18 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32],
- "subu %[temp1], %[temp1], %[temp5] \n\t" \\r
- "subu %[temp0], %[temp0], %[temp6] \n\t" \\r
- "subu %[temp8], %[temp8], %[temp7] \n\t" \\r
-- "lhu %[temp4], "#E"(%[w]) \n\t" \\r
-- "lhu %[temp5], "#F"(%[w]) \n\t" \\r
-- "lhu %[temp6], "#G"(%[w]) \n\t" \\r
-- "lhu %[temp7], "#H"(%[w]) \n\t" \\r
-+ "lhu %[temp4], " #E "(%[w]) \n\t" \\r
-+ "lhu %[temp5], " #F "(%[w]) \n\t" \\r
-+ "lhu %[temp6], " #G "(%[w]) \n\t" \\r
-+ "lhu %[temp7], " #H "(%[w]) \n\t" \\r
- "madd %[temp4], %[temp3] \n\t" \\r
- "madd %[temp5], %[temp1] \n\t" \\r
- "madd %[temp6], %[temp0] \n\t" \\r
- "madd %[temp7], %[temp8] \n\t" \\r
-- "lw %[temp0], "#A"(%[tmp]) \n\t" \\r
-- "lw %[temp1], "#C"(%[tmp]) \n\t" \\r
-- "lw %[temp2], "#B"(%[tmp]) \n\t" \\r
-- "lw %[temp3], "#D"(%[tmp]) \n\t" \\r
-+ "lw %[temp0], " #A "(%[tmp]) \n\t" \\r
-+ "lw %[temp1], " #C "(%[tmp]) \n\t" \\r
-+ "lw %[temp2], " #B "(%[tmp]) \n\t" \\r
-+ "lw %[temp3], " #D "(%[tmp]) \n\t" \\r
- "addu %[temp8], %[temp0], %[temp1] \n\t" \\r
- "subu %[temp0], %[temp0], %[temp1] \n\t" \\r
- "addu %[temp1], %[temp2], %[temp3] \n\t" \\r
-@@ -413,70 +413,70 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b,
- // A - offset in bytes to load from src and ref buffers\r
- // TEMP0..TEMP3 - registers for corresponding tmp elements\r
- #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \\r
-- "lw %["#TEMP1"], 0(%[args]) \n\t" \\r
-- "lw %["#TEMP2"], 4(%[args]) \n\t" \\r
-- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \\r
-- "lbu %[temp17], 0+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \\r
-- "lbu %[temp18], 1+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \\r
-- "lbu %[temp19], 1+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \\r
-+ "lw %[" #TEMP1 "], 0(%[args]) \n\t" \\r
-+ "lw %[" #TEMP2 "], 4(%[args]) \n\t" \\r
-+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \\r
-+ "lbu %[temp17], 0+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \\r
-+ "lbu %[temp18], 1+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \\r
-+ "lbu %[temp19], 1+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \\r
- "subu %[temp20], %[temp16], %[temp17] \n\t" \\r
-- "lbu %[temp16], 2+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \\r
-- "lbu %[temp17], 2+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \\r
-- "subu %["#TEMP0"], %[temp18], %[temp19] \n\t" \\r
-- "lbu %[temp18], 3+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \\r
-- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \\r
-- "subu %["#TEMP1"], %[temp16], %[temp17] \n\t" \\r
-- "subu %["#TEMP2"], %[temp18], %[temp19] \n\t" \\r
-- "addu %["#TEMP3"], %[temp20], %["#TEMP2"] \n\t" \\r
-- "subu %["#TEMP2"], %[temp20], %["#TEMP2"] \n\t" \\r
-- "addu %[temp20], %["#TEMP0"], %["#TEMP1"] \n\t" \\r
-- "subu %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \\r
-- "mul %[temp16], %["#TEMP2"], %[c5352] \n\t" \\r
-- "mul %[temp17], %["#TEMP2"], %[c2217] \n\t" \\r
-- "mul %[temp18], %["#TEMP0"], %[c5352] \n\t" \\r
-- "mul %[temp19], %["#TEMP0"], %[c2217] \n\t" \\r
-- "addu %["#TEMP1"], %["#TEMP3"], %[temp20] \n\t" \\r
-- "subu %[temp20], %["#TEMP3"], %[temp20] \n\t" \\r
-- "sll %["#TEMP0"], %["#TEMP1"], 3 \n\t" \\r
-- "sll %["#TEMP2"], %[temp20], 3 \n\t" \\r
-+ "lbu %[temp16], 2+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \\r
-+ "lbu %[temp17], 2+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \\r
-+ "subu %[" #TEMP0 "], %[temp18], %[temp19] \n\t" \\r
-+ "lbu %[temp18], 3+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \\r
-+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \\r
-+ "subu %[" #TEMP1 "], %[temp16], %[temp17] \n\t" \\r
-+ "subu %[" #TEMP2 "], %[temp18], %[temp19] \n\t" \\r
-+ "addu %[" #TEMP3 "], %[temp20], %[" #TEMP2 "] \n\t" \\r
-+ "subu %[" #TEMP2 "], %[temp20], %[" #TEMP2 "] \n\t" \\r
-+ "addu %[temp20], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \\r
-+ "subu %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \\r
-+ "mul %[temp16], %[" #TEMP2 "], %[c5352] \n\t" \\r
-+ "mul %[temp17], %[" #TEMP2 "], %[c2217] \n\t" \\r
-+ "mul %[temp18], %[" #TEMP0 "], %[c5352] \n\t" \\r
-+ "mul %[temp19], %[" #TEMP0 "], %[c2217] \n\t" \\r
-+ "addu %[" #TEMP1 "], %[" #TEMP3 "], %[temp20] \n\t" \\r
-+ "subu %[temp20], %[" #TEMP3 "], %[temp20] \n\t" \\r
-+ "sll %[" #TEMP0 "], %[" #TEMP1 "], 3 \n\t" \\r
-+ "sll %[" #TEMP2 "], %[temp20], 3 \n\t" \\r
- "addiu %[temp16], %[temp16], 1812 \n\t" \\r
- "addiu %[temp17], %[temp17], 937 \n\t" \\r
- "addu %[temp16], %[temp16], %[temp19] \n\t" \\r
- "subu %[temp17], %[temp17], %[temp18] \n\t" \\r
-- "sra %["#TEMP1"], %[temp16], 9 \n\t" \\r
-- "sra %["#TEMP3"], %[temp17], 9 \n\t"\r
-+ "sra %[" #TEMP1 "], %[temp16], 9 \n\t" \\r
-+ "sra %[" #TEMP3 "], %[temp17], 9 \n\t"\r
- \r
- // macro for one vertical pass in FTransform\r
- // temp0..temp15 holds tmp[0]..tmp[15]\r
- // A..D - offsets in bytes to store to out buffer\r
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements\r
- #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \\r
-- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \\r
-- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \\r
-- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \\r
-- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \\r
-- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \\r
-- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \\r
-- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \\r
-+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \\r
-+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \\r
-+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \\r
-+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \\r
-+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \\r
-+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \\r
-+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \\r
- "mul %[temp18], %[temp18], %[c5352] \n\t" \\r
- "addiu %[temp16], %[temp16], 7 \n\t" \\r
-- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \\r
-- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \\r
-- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \\r
-- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \\r
-- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \\r
-- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \\r
-- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \\r
-- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \\r
-- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \\r
-- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \\r
-- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \\r
-- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \\r
-- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \\r
-- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t"\r
-+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \\r
-+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \\r
-+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \\r
-+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \\r
-+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \\r
-+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \\r
-+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \\r
-+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \\r
-+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \\r
-+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \\r
-+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \\r
-+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \\r
-+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \\r
-+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t"\r
- \r
- static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) {\r
- int temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp7, temp8;\r
-@@ -516,14 +516,14 @@ static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) {
- #if !defined(WORK_AROUND_GCC)\r
- \r
- #define GET_SSE_INNER(A, B, C, D) \\r
-- "lbu %[temp0], "#A"(%[a]) \n\t" \\r
-- "lbu %[temp1], "#A"(%[b]) \n\t" \\r
-- "lbu %[temp2], "#B"(%[a]) \n\t" \\r
-- "lbu %[temp3], "#B"(%[b]) \n\t" \\r
-- "lbu %[temp4], "#C"(%[a]) \n\t" \\r
-- "lbu %[temp5], "#C"(%[b]) \n\t" \\r
-- "lbu %[temp6], "#D"(%[a]) \n\t" \\r
-- "lbu %[temp7], "#D"(%[b]) \n\t" \\r
-+ "lbu %[temp0], " #A "(%[a]) \n\t" \\r
-+ "lbu %[temp1], " #A "(%[b]) \n\t" \\r
-+ "lbu %[temp2], " #B "(%[a]) \n\t" \\r
-+ "lbu %[temp3], " #B "(%[b]) \n\t" \\r
-+ "lbu %[temp4], " #C "(%[a]) \n\t" \\r
-+ "lbu %[temp5], " #C "(%[b]) \n\t" \\r
-+ "lbu %[temp6], " #D "(%[a]) \n\t" \\r
-+ "lbu %[temp7], " #D "(%[b]) \n\t" \\r
- "subu %[temp0], %[temp0], %[temp1] \n\t" \\r
- "subu %[temp2], %[temp2], %[temp3] \n\t" \\r
- "subu %[temp4], %[temp4], %[temp5] \n\t" \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-index ec58efe..1a3f968 100644
---- a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-@@ -27,25 +27,25 @@ static const int kC2 = 35468;
- // I - input (macro doesn't change it)\r
- #define ADD_SUB_HALVES_X4(O0, O1, O2, O3, O4, O5, O6, O7, \\r
- I0, I1, I2, I3, I4, I5, I6, I7) \\r
-- "addq.ph %["#O0"], %["#I0"], %["#I1"] \n\t" \\r
-- "subq.ph %["#O1"], %["#I0"], %["#I1"] \n\t" \\r
-- "addq.ph %["#O2"], %["#I2"], %["#I3"] \n\t" \\r
-- "subq.ph %["#O3"], %["#I2"], %["#I3"] \n\t" \\r
-- "addq.ph %["#O4"], %["#I4"], %["#I5"] \n\t" \\r
-- "subq.ph %["#O5"], %["#I4"], %["#I5"] \n\t" \\r
-- "addq.ph %["#O6"], %["#I6"], %["#I7"] \n\t" \\r
-- "subq.ph %["#O7"], %["#I6"], %["#I7"] \n\t"\r
-+ "addq.ph %[" #O0 "], %[" #I0 "], %[" #I1 "] \n\t" \\r
-+ "subq.ph %[" #O1 "], %[" #I0 "], %[" #I1 "] \n\t" \\r
-+ "addq.ph %[" #O2 "], %[" #I2 "], %[" #I3 "] \n\t" \\r
-+ "subq.ph %[" #O3 "], %[" #I2 "], %[" #I3 "] \n\t" \\r
-+ "addq.ph %[" #O4 "], %[" #I4 "], %[" #I5 "] \n\t" \\r
-+ "subq.ph %[" #O5 "], %[" #I4 "], %[" #I5 "] \n\t" \\r
-+ "addq.ph %[" #O6 "], %[" #I6 "], %[" #I7 "] \n\t" \\r
-+ "subq.ph %[" #O7 "], %[" #I6 "], %[" #I7 "] \n\t"\r
- \r
- // IO - input/output\r
- #define ABS_X8(IO0, IO1, IO2, IO3, IO4, IO5, IO6, IO7) \\r
-- "absq_s.ph %["#IO0"], %["#IO0"] \n\t" \\r
-- "absq_s.ph %["#IO1"], %["#IO1"] \n\t" \\r
-- "absq_s.ph %["#IO2"], %["#IO2"] \n\t" \\r
-- "absq_s.ph %["#IO3"], %["#IO3"] \n\t" \\r
-- "absq_s.ph %["#IO4"], %["#IO4"] \n\t" \\r
-- "absq_s.ph %["#IO5"], %["#IO5"] \n\t" \\r
-- "absq_s.ph %["#IO6"], %["#IO6"] \n\t" \\r
-- "absq_s.ph %["#IO7"], %["#IO7"] \n\t"\r
-+ "absq_s.ph %[" #IO0 "], %[" #IO0 "] \n\t" \\r
-+ "absq_s.ph %[" #IO1 "], %[" #IO1 "] \n\t" \\r
-+ "absq_s.ph %[" #IO2 "], %[" #IO2 "] \n\t" \\r
-+ "absq_s.ph %[" #IO3 "], %[" #IO3 "] \n\t" \\r
-+ "absq_s.ph %[" #IO4 "], %[" #IO4 "] \n\t" \\r
-+ "absq_s.ph %[" #IO5 "], %[" #IO5 "] \n\t" \\r
-+ "absq_s.ph %[" #IO6 "], %[" #IO6 "] \n\t" \\r
-+ "absq_s.ph %[" #IO7 "], %[" #IO7 "] \n\t"\r
- \r
- // dpa.w.ph $ac0 temp0 ,temp1\r
- // $ac += temp0[31..16] * temp1[31..16] + temp0[15..0] * temp1[15..0]\r
-@@ -56,15 +56,15 @@ static const int kC2 = 35468;
- #define MUL_HALF(O0, I0, I1, I2, I3, I4, I5, I6, I7, \\r
- I8, I9, I10, I11, I12, I13, I14, I15) \\r
- "mult $ac0, $zero, $zero \n\t" \\r
-- "dpa.w.ph $ac0, %["#I2"], %["#I0"] \n\t" \\r
-- "dpax.w.ph $ac0, %["#I5"], %["#I6"] \n\t" \\r
-- "dpa.w.ph $ac0, %["#I8"], %["#I9"] \n\t" \\r
-- "dpax.w.ph $ac0, %["#I11"], %["#I4"] \n\t" \\r
-- "dpa.w.ph $ac0, %["#I12"], %["#I7"] \n\t" \\r
-- "dpax.w.ph $ac0, %["#I13"], %["#I1"] \n\t" \\r
-- "dpa.w.ph $ac0, %["#I14"], %["#I3"] \n\t" \\r
-- "dpax.w.ph $ac0, %["#I15"], %["#I10"] \n\t" \\r
-- "mflo %["#O0"], $ac0 \n\t"\r
-+ "dpa.w.ph $ac0, %[" #I2 "], %[" #I0 "] \n\t" \\r
-+ "dpax.w.ph $ac0, %[" #I5 "], %[" #I6 "] \n\t" \\r
-+ "dpa.w.ph $ac0, %[" #I8 "], %[" #I9 "] \n\t" \\r
-+ "dpax.w.ph $ac0, %[" #I11 "], %[" #I4 "] \n\t" \\r
-+ "dpa.w.ph $ac0, %[" #I12 "], %[" #I7 "] \n\t" \\r
-+ "dpax.w.ph $ac0, %[" #I13 "], %[" #I1 "] \n\t" \\r
-+ "dpa.w.ph $ac0, %[" #I14 "], %[" #I3 "] \n\t" \\r
-+ "dpax.w.ph $ac0, %[" #I15 "], %[" #I10 "] \n\t" \\r
-+ "mflo %[" #O0 "], $ac0 \n\t"\r
- \r
- #define OUTPUT_EARLY_CLOBBER_REGS_17() \\r
- OUTPUT_EARLY_CLOBBER_REGS_10(), \\r
-@@ -77,69 +77,69 @@ static const int kC2 = 35468;
- // A - offset in bytes to load from src and ref buffers\r
- // TEMP0..TEMP3 - registers for corresponding tmp elements\r
- #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \\r
-- "lw %["#TEMP0"], 0(%[args]) \n\t" \\r
-- "lw %["#TEMP1"], 4(%[args]) \n\t" \\r
-- "lw %["#TEMP2"], "XSTR(BPS)"*"#A"(%["#TEMP0"]) \n\t" \\r
-- "lw %["#TEMP3"], "XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \\r
-- "preceu.ph.qbl %["#TEMP0"], %["#TEMP2"] \n\t" \\r
-- "preceu.ph.qbl %["#TEMP1"], %["#TEMP3"] \n\t" \\r
-- "preceu.ph.qbr %["#TEMP2"], %["#TEMP2"] \n\t" \\r
-- "preceu.ph.qbr %["#TEMP3"], %["#TEMP3"] \n\t" \\r
-- "subq.ph %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \\r
-- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP3"] \n\t" \\r
-- "rotr %["#TEMP0"], %["#TEMP0"], 16 \n\t" \\r
-- "addq.ph %["#TEMP1"], %["#TEMP2"], %["#TEMP0"] \n\t" \\r
-- "subq.ph %["#TEMP3"], %["#TEMP2"], %["#TEMP0"] \n\t" \\r
-- "seh %["#TEMP0"], %["#TEMP1"] \n\t" \\r
-- "sra %[temp16], %["#TEMP1"], 16 \n\t" \\r
-- "seh %[temp19], %["#TEMP3"] \n\t" \\r
-- "sra %["#TEMP3"], %["#TEMP3"], 16 \n\t" \\r
-- "subu %["#TEMP2"], %["#TEMP0"], %[temp16] \n\t" \\r
-- "addu %["#TEMP0"], %["#TEMP0"], %[temp16] \n\t" \\r
-+ "lw %[" #TEMP0 "], 0(%[args]) \n\t" \\r
-+ "lw %[" #TEMP1 "], 4(%[args]) \n\t" \\r
-+ "lw %[" #TEMP2 "], "XSTR(BPS)"*" #A "(%[" #TEMP0 "]) \n\t" \\r
-+ "lw %[" #TEMP3 "], "XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \\r
-+ "preceu.ph.qbl %[" #TEMP0 "], %[" #TEMP2 "] \n\t" \\r
-+ "preceu.ph.qbl %[" #TEMP1 "], %[" #TEMP3 "] \n\t" \\r
-+ "preceu.ph.qbr %[" #TEMP2 "], %[" #TEMP2 "] \n\t" \\r
-+ "preceu.ph.qbr %[" #TEMP3 "], %[" #TEMP3 "] \n\t" \\r
-+ "subq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \\r
-+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP3 "] \n\t" \\r
-+ "rotr %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \\r
-+ "addq.ph %[" #TEMP1 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \\r
-+ "subq.ph %[" #TEMP3 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \\r
-+ "seh %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \\r
-+ "sra %[temp16], %[" #TEMP1 "], 16 \n\t" \\r
-+ "seh %[temp19], %[" #TEMP3 "] \n\t" \\r
-+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 16 \n\t" \\r
-+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp16] \n\t" \\r
-+ "addu %[" #TEMP0 "], %[" #TEMP0 "], %[temp16] \n\t" \\r
- "mul %[temp17], %[temp19], %[c2217] \n\t" \\r
-- "mul %[temp18], %["#TEMP3"], %[c5352] \n\t" \\r
-- "mul %["#TEMP1"], %[temp19], %[c5352] \n\t" \\r
-- "mul %[temp16], %["#TEMP3"], %[c2217] \n\t" \\r
-- "sll %["#TEMP2"], %["#TEMP2"], 3 \n\t" \\r
-- "sll %["#TEMP0"], %["#TEMP0"], 3 \n\t" \\r
-- "subu %["#TEMP3"], %[temp17], %[temp18] \n\t" \\r
-- "addu %["#TEMP1"], %[temp16], %["#TEMP1"] \n\t" \\r
-- "addiu %["#TEMP3"], %["#TEMP3"], 937 \n\t" \\r
-- "addiu %["#TEMP1"], %["#TEMP1"], 1812 \n\t" \\r
-- "sra %["#TEMP3"], %["#TEMP3"], 9 \n\t" \\r
-- "sra %["#TEMP1"], %["#TEMP1"], 9 \n\t"\r
-+ "mul %[temp18], %[" #TEMP3 "], %[c5352] \n\t" \\r
-+ "mul %[" #TEMP1 "], %[temp19], %[c5352] \n\t" \\r
-+ "mul %[temp16], %[" #TEMP3 "], %[c2217] \n\t" \\r
-+ "sll %[" #TEMP2 "], %[" #TEMP2 "], 3 \n\t" \\r
-+ "sll %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \\r
-+ "subu %[" #TEMP3 "], %[temp17], %[temp18] \n\t" \\r
-+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP1 "] \n\t" \\r
-+ "addiu %[" #TEMP3 "], %[" #TEMP3 "], 937 \n\t" \\r
-+ "addiu %[" #TEMP1 "], %[" #TEMP1 "], 1812 \n\t" \\r
-+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 9 \n\t" \\r
-+ "sra %[" #TEMP1 "], %[" #TEMP1 "], 9 \n\t"\r
- \r
- // macro for one vertical pass in FTransform\r
- // temp0..temp15 holds tmp[0]..tmp[15]\r
- // A..D - offsets in bytes to store to out buffer\r
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements\r
- #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \\r
-- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \\r
-- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \\r
-- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \\r
-- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \\r
-- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \\r
-- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \\r
-- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \\r
-+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \\r
-+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \\r
-+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \\r
-+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \\r
-+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \\r
-+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \\r
-+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \\r
- "mul %[temp18], %[temp18], %[c5352] \n\t" \\r
- "addiu %[temp16], %[temp16], 7 \n\t" \\r
-- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \\r
-- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \\r
-- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \\r
-- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \\r
-- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \\r
-- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \\r
-- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \\r
-- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \\r
-- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \\r
-- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \\r
-- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \\r
-- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \\r
-- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \\r
-- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \\r
-- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t"\r
-+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \\r
-+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \\r
-+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \\r
-+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \\r
-+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \\r
-+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \\r
-+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \\r
-+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \\r
-+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \\r
-+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \\r
-+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \\r
-+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \\r
-+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \\r
-+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \\r
-+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t"\r
- \r
- static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) {\r
- const int c2217 = 2217;\r
-@@ -329,11 +329,11 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b,
- // Intra predictions\r
- \r
- #define FILL_PART(J, SIZE) \\r
-- "usw %[value], 0+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \\r
-- "usw %[value], 4+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \\r
-- ".if "#SIZE" == 16 \n\t" \\r
-- "usw %[value], 8+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \\r
-- "usw %[value], 12+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \\r
-+ "usw %[value], 0+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \\r
-+ "usw %[value], 4+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \\r
-+ ".if " #SIZE " == 16 \n\t" \\r
-+ "usw %[value], 8+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \\r
-+ "usw %[value], 12+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \\r
- ".endif \n\t"\r
- \r
- #define FILL_8_OR_16(DST, VALUE, SIZE) do { \\r
-@@ -348,7 +348,7 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b,
- FILL_PART( 5, SIZE) \\r
- FILL_PART( 6, SIZE) \\r
- FILL_PART( 7, SIZE) \\r
-- ".if "#SIZE" == 16 \n\t" \\r
-+ ".if " #SIZE " == 16 \n\t" \\r
- FILL_PART( 8, 16) \\r
- FILL_PART( 9, 16) \\r
- FILL_PART(10, 16) \\r
-@@ -425,7 +425,7 @@ HORIZONTAL_PRED(dst, left, 16)
- CLIPPING() \\r
- "usw %[temp0], 0(%[dst]) \n\t" \\r
- "usw %[temp1], 4(%[dst]) \n\t" \\r
-- ".if "#SIZE" == 16 \n\t" \\r
-+ ".if " #SIZE " == 16 \n\t" \\r
- "ulw %[temp0], 8(%[top]) \n\t" \\r
- "ulw %[temp1], 12(%[top]) \n\t" \\r
- CLIPPING() \\r
-@@ -1060,8 +1060,8 @@ static void Intra4Preds(uint8_t* dst, const uint8_t* top) {
- #if !defined(WORK_AROUND_GCC)\r
- \r
- #define GET_SSE_INNER(A) \\r
-- "lw %[temp0], "#A"(%[a]) \n\t" \\r
-- "lw %[temp1], "#A"(%[b]) \n\t" \\r
-+ "lw %[temp0], " #A "(%[a]) \n\t" \\r
-+ "lw %[temp1], " #A "(%[b]) \n\t" \\r
- "preceu.ph.qbr %[temp2], %[temp0] \n\t" \\r
- "preceu.ph.qbl %[temp0], %[temp0] \n\t" \\r
- "preceu.ph.qbr %[temp3], %[temp1] \n\t" \\r
-@@ -1185,28 +1185,28 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
- // N - offset in bytes (n * 2)\r
- // N1 - offset in bytes ((n + 1) * 2)\r
- #define QUANTIZE_ONE(J, K, N, N1) \\r
-- "ulw %[temp1], "#J"(%[ppin]) \n\t" \\r
-- "ulw %[temp2], "#J"(%[ppsharpen]) \n\t" \\r
-- "lhu %[temp3], "#K"(%[ppzthresh]) \n\t" \\r
-- "lhu %[temp6], "#K"+4(%[ppzthresh]) \n\t" \\r
-+ "ulw %[temp1], " #J "(%[ppin]) \n\t" \\r
-+ "ulw %[temp2], " #J "(%[ppsharpen]) \n\t" \\r
-+ "lhu %[temp3], " #K "(%[ppzthresh]) \n\t" \\r
-+ "lhu %[temp6], " #K "+4(%[ppzthresh]) \n\t" \\r
- "absq_s.ph %[temp4], %[temp1] \n\t" \\r
- "ins %[temp3], %[temp6], 16, 16 \n\t" \\r
- "addu.ph %[coeff], %[temp4], %[temp2] \n\t" \\r
- "shra.ph %[sign], %[temp1], 15 \n\t" \\r
- "li %[level], 0x10001 \n\t" \\r
- "cmp.lt.ph %[temp3], %[coeff] \n\t" \\r
-- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \\r
-+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \\r
- "pick.ph %[temp5], %[level], $0 \n\t" \\r
-- "lw %[temp2], "#K"(%[ppbias]) \n\t" \\r
-+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \\r
- "beqz %[temp5], 0f \n\t" \\r
-- "lhu %[temp3], "#J"(%[ppq]) \n\t" \\r
-+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \\r
- "beq %[temp5], %[level], 1f \n\t" \\r
- "andi %[temp5], %[temp5], 0x1 \n\t" \\r
- "andi %[temp4], %[coeff], 0xffff \n\t" \\r
- "beqz %[temp5], 2f \n\t" \\r
- "mul %[level], %[temp4], %[temp1] \n\t" \\r
-- "sh $0, "#J"+2(%[ppin]) \n\t" \\r
-- "sh $0, "#N1"(%[pout]) \n\t" \\r
-+ "sh $0, " #J "+2(%[ppin]) \n\t" \\r
-+ "sh $0, " #N1 "(%[pout]) \n\t" \\r
- "addu %[level], %[level], %[temp2] \n\t" \\r
- "sra %[level], %[level], 17 \n\t" \\r
- "slt %[temp4], %[max_level], %[level] \n\t" \\r
-@@ -1216,15 +1216,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
- "subu %[level], %[level], %[temp6] \n\t" \\r
- "mul %[temp5], %[level], %[temp3] \n\t" \\r
- "or %[ret], %[ret], %[level] \n\t" \\r
-- "sh %[level], "#N"(%[pout]) \n\t" \\r
-- "sh %[temp5], "#J"(%[ppin]) \n\t" \\r
-+ "sh %[level], " #N "(%[pout]) \n\t" \\r
-+ "sh %[temp5], " #J "(%[ppin]) \n\t" \\r
- "j 3f \n\t" \\r
- "2: \n\t" \\r
-- "lhu %[temp1], "#J"+2(%[ppiq]) \n\t" \\r
-+ "lhu %[temp1], " #J "+2(%[ppiq]) \n\t" \\r
- "srl %[temp5], %[coeff], 16 \n\t" \\r
- "mul %[level], %[temp5], %[temp1] \n\t" \\r
-- "lw %[temp2], "#K"+4(%[ppbias]) \n\t" \\r
-- "lhu %[temp3], "#J"+2(%[ppq]) \n\t" \\r
-+ "lw %[temp2], " #K "+4(%[ppbias]) \n\t" \\r
-+ "lhu %[temp3], " #J "+2(%[ppq]) \n\t" \\r
- "addu %[level], %[level], %[temp2] \n\t" \\r
- "sra %[level], %[level], 17 \n\t" \\r
- "srl %[temp6], %[sign], 16 \n\t" \\r
-@@ -1233,20 +1233,20 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
- "xor %[level], %[level], %[temp6] \n\t" \\r
- "subu %[level], %[level], %[temp6] \n\t" \\r
- "mul %[temp5], %[level], %[temp3] \n\t" \\r
-- "sh $0, "#J"(%[ppin]) \n\t" \\r
-- "sh $0, "#N"(%[pout]) \n\t" \\r
-+ "sh $0, " #J "(%[ppin]) \n\t" \\r
-+ "sh $0, " #N "(%[pout]) \n\t" \\r
- "or %[ret], %[ret], %[level] \n\t" \\r
-- "sh %[temp5], "#J"+2(%[ppin]) \n\t" \\r
-- "sh %[level], "#N1"(%[pout]) \n\t" \\r
-+ "sh %[temp5], " #J "+2(%[ppin]) \n\t" \\r
-+ "sh %[level], " #N1 "(%[pout]) \n\t" \\r
- "j 3f \n\t" \\r
- "1: \n\t" \\r
-- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \\r
-- "lw %[temp2], "#K"(%[ppbias]) \n\t" \\r
-- "ulw %[temp3], "#J"(%[ppq]) \n\t" \\r
-+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \\r
-+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \\r
-+ "ulw %[temp3], " #J "(%[ppq]) \n\t" \\r
- "andi %[temp5], %[coeff], 0xffff \n\t" \\r
- "srl %[temp0], %[coeff], 16 \n\t" \\r
-- "lhu %[temp6], "#J"+2(%[ppiq]) \n\t" \\r
-- "lw %[coeff], "#K"+4(%[ppbias]) \n\t" \\r
-+ "lhu %[temp6], " #J "+2(%[ppiq]) \n\t" \\r
-+ "lw %[coeff], " #K "+4(%[ppbias]) \n\t" \\r
- "mul %[level], %[temp5], %[temp1] \n\t" \\r
- "mul %[temp4], %[temp0], %[temp6] \n\t" \\r
- "addu %[level], %[level], %[temp2] \n\t" \\r
-@@ -1259,15 +1259,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) {
- "subu.ph %[level], %[level], %[sign] \n\t" \\r
- "mul.ph %[temp3], %[level], %[temp3] \n\t" \\r
- "or %[ret], %[ret], %[level] \n\t" \\r
-- "sh %[level], "#N"(%[pout]) \n\t" \\r
-+ "sh %[level], " #N "(%[pout]) \n\t" \\r
- "srl %[level], %[level], 16 \n\t" \\r
-- "sh %[level], "#N1"(%[pout]) \n\t" \\r
-- "usw %[temp3], "#J"(%[ppin]) \n\t" \\r
-+ "sh %[level], " #N1 "(%[pout]) \n\t" \\r
-+ "usw %[temp3], " #J "(%[ppin]) \n\t" \\r
- "j 3f \n\t" \\r
- "0: \n\t" \\r
-- "sh $0, "#N"(%[pout]) \n\t" \\r
-- "sh $0, "#N1"(%[pout]) \n\t" \\r
-- "usw $0, "#J"(%[ppin]) \n\t" \\r
-+ "sh $0, " #N "(%[pout]) \n\t" \\r
-+ "sh $0, " #N1 "(%[pout]) \n\t" \\r
-+ "usw $0, " #J "(%[ppin]) \n\t" \\r
- "3: \n\t"\r
- \r
- static int QuantizeBlock(int16_t in[16], int16_t out[16],\r
-@@ -1326,37 +1326,37 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32],
- // A, B, C, D - offset in bytes to load from in buffer\r
- // TEMP0, TEMP1 - registers for corresponding tmp elements\r
- #define HORIZONTAL_PASS_WHT(A, B, C, D, TEMP0, TEMP1) \\r
-- "lh %["#TEMP0"], "#A"(%[in]) \n\t" \\r
-- "lh %["#TEMP1"], "#B"(%[in]) \n\t" \\r
-- "lh %[temp8], "#C"(%[in]) \n\t" \\r
-- "lh %[temp9], "#D"(%[in]) \n\t" \\r
-- "ins %["#TEMP1"], %["#TEMP0"], 16, 16 \n\t" \\r
-+ "lh %[" #TEMP0 "], " #A "(%[in]) \n\t" \\r
-+ "lh %[" #TEMP1 "], " #B "(%[in]) \n\t" \\r
-+ "lh %[temp8], " #C "(%[in]) \n\t" \\r
-+ "lh %[temp9], " #D "(%[in]) \n\t" \\r
-+ "ins %[" #TEMP1 "], %[" #TEMP0 "], 16, 16 \n\t" \\r
- "ins %[temp9], %[temp8], 16, 16 \n\t" \\r
-- "subq.ph %[temp8], %["#TEMP1"], %[temp9] \n\t" \\r
-- "addq.ph %[temp9], %["#TEMP1"], %[temp9] \n\t" \\r
-- "precrq.ph.w %["#TEMP0"], %[temp8], %[temp9] \n\t" \\r
-+ "subq.ph %[temp8], %[" #TEMP1 "], %[temp9] \n\t" \\r
-+ "addq.ph %[temp9], %[" #TEMP1 "], %[temp9] \n\t" \\r
-+ "precrq.ph.w %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \\r
- "append %[temp8], %[temp9], 16 \n\t" \\r
-- "subq.ph %["#TEMP1"], %["#TEMP0"], %[temp8] \n\t" \\r
-- "addq.ph %["#TEMP0"], %["#TEMP0"], %[temp8] \n\t" \\r
-- "rotr %["#TEMP1"], %["#TEMP1"], 16 \n\t"\r
-+ "subq.ph %[" #TEMP1 "], %[" #TEMP0 "], %[temp8] \n\t" \\r
-+ "addq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[temp8] \n\t" \\r
-+ "rotr %[" #TEMP1 "], %[" #TEMP1 "], 16 \n\t"\r
- \r
- // macro for one vertical pass in FTransformWHT\r
- // temp0..temp7 holds tmp[0]..tmp[15]\r
- // A, B, C, D - offsets in bytes to store to out buffer\r
- // TEMP0, TEMP2, TEMP4 and TEMP6 - registers for corresponding tmp elements\r
- #define VERTICAL_PASS_WHT(A, B, C, D, TEMP0, TEMP2, TEMP4, TEMP6) \\r
-- "addq.ph %[temp8], %["#TEMP0"], %["#TEMP4"] \n\t" \\r
-- "addq.ph %[temp9], %["#TEMP2"], %["#TEMP6"] \n\t" \\r
-- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \\r
-- "subq.ph %["#TEMP6"], %["#TEMP0"], %["#TEMP4"] \n\t" \\r
-- "addqh.ph %["#TEMP0"], %[temp8], %[temp9] \n\t" \\r
-- "subqh.ph %["#TEMP4"], %["#TEMP6"], %["#TEMP2"] \n\t" \\r
-- "addqh.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \\r
-- "subqh.ph %["#TEMP6"], %[temp8], %[temp9] \n\t" \\r
-- "usw %["#TEMP0"], "#A"(%[out]) \n\t" \\r
-- "usw %["#TEMP2"], "#B"(%[out]) \n\t" \\r
-- "usw %["#TEMP4"], "#C"(%[out]) \n\t" \\r
-- "usw %["#TEMP6"], "#D"(%[out]) \n\t"\r
-+ "addq.ph %[temp8], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \\r
-+ "addq.ph %[temp9], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \\r
-+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \\r
-+ "subq.ph %[" #TEMP6 "], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \\r
-+ "addqh.ph %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \\r
-+ "subqh.ph %[" #TEMP4 "], %[" #TEMP6 "], %[" #TEMP2 "] \n\t" \\r
-+ "addqh.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \\r
-+ "subqh.ph %[" #TEMP6 "], %[temp8], %[temp9] \n\t" \\r
-+ "usw %[" #TEMP0 "], " #A "(%[out]) \n\t" \\r
-+ "usw %[" #TEMP2 "], " #B "(%[out]) \n\t" \\r
-+ "usw %[" #TEMP4 "], " #C "(%[out]) \n\t" \\r
-+ "usw %[" #TEMP6 "], " #D "(%[out]) \n\t"\r
- \r
- static void FTransformWHT(const int16_t* in, int16_t* out) {\r
- int temp0, temp1, temp2, temp3, temp4;\r
-@@ -1385,10 +1385,10 @@ static void FTransformWHT(const int16_t* in, int16_t* out) {
- // convert 8 coeffs at time\r
- // A, B, C, D - offsets in bytes to load from out buffer\r
- #define CONVERT_COEFFS_TO_BIN(A, B, C, D) \\r
-- "ulw %[temp0], "#A"(%[out]) \n\t" \\r
-- "ulw %[temp1], "#B"(%[out]) \n\t" \\r
-- "ulw %[temp2], "#C"(%[out]) \n\t" \\r
-- "ulw %[temp3], "#D"(%[out]) \n\t" \\r
-+ "ulw %[temp0], " #A "(%[out]) \n\t" \\r
-+ "ulw %[temp1], " #B "(%[out]) \n\t" \\r
-+ "ulw %[temp2], " #C "(%[out]) \n\t" \\r
-+ "ulw %[temp3], " #D "(%[out]) \n\t" \\r
- "absq_s.ph %[temp0], %[temp0] \n\t" \\r
- "absq_s.ph %[temp1], %[temp1] \n\t" \\r
- "absq_s.ph %[temp2], %[temp2] \n\t" \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-index 6c34efb..6a1f8f4 100644
---- a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-@@ -48,7 +48,7 @@
- "srl %[temp0], %[length], 0x2 \n\t" \\r
- "beqz %[temp0], 4f \n\t" \\r
- " andi %[temp6], %[length], 0x3 \n\t" \\r
-- ".if "#INVERSE" \n\t" \\r
-+ ".if " #INVERSE " \n\t" \\r
- "lbu %[temp1], -1(%[src]) \n\t" \\r
- "1: \n\t" \\r
- "lbu %[temp2], 0(%[src]) \n\t" \\r
-@@ -84,7 +84,7 @@
- "lbu %[temp1], -1(%[src]) \n\t" \\r
- "lbu %[temp2], 0(%[src]) \n\t" \\r
- "addiu %[src], %[src], 1 \n\t" \\r
-- ".if "#INVERSE" \n\t" \\r
-+ ".if " #INVERSE " \n\t" \\r
- "addu %[temp3], %[temp1], %[temp2] \n\t" \\r
- "sb %[temp3], -1(%[src]) \n\t" \\r
- ".else \n\t" \\r
-@@ -131,7 +131,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst,
- "ulw %[temp3], 4(%[src]) \n\t" \\r
- "ulw %[temp4], 4(%[pred]) \n\t" \\r
- "addiu %[src], %[src], 8 \n\t" \\r
-- ".if "#INVERSE" \n\t" \\r
-+ ".if " #INVERSE " \n\t" \\r
- "addu.qb %[temp5], %[temp1], %[temp2] \n\t" \\r
- "addu.qb %[temp6], %[temp3], %[temp4] \n\t" \\r
- ".else \n\t" \\r
-@@ -152,7 +152,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst,
- "lbu %[temp2], 0(%[pred]) \n\t" \\r
- "addiu %[src], %[src], 1 \n\t" \\r
- "addiu %[pred], %[pred], 1 \n\t" \\r
-- ".if "#INVERSE" \n\t" \\r
-+ ".if " #INVERSE " \n\t" \\r
- "addu %[temp3], %[temp1], %[temp2] \n\t" \\r
- ".else \n\t" \\r
- "subu %[temp3], %[temp1], %[temp2] \n\t" \\r
-@@ -177,7 +177,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst,
- __asm__ volatile ( \\r
- "lbu %[temp1], 0(%[src]) \n\t" \\r
- "lbu %[temp2], 0(%[pred]) \n\t" \\r
-- ".if "#INVERSE" \n\t" \\r
-+ ".if " #INVERSE " \n\t" \\r
- "addu %[temp3], %[temp1], %[temp2] \n\t" \\r
- ".else \n\t" \\r
- "subu %[temp3], %[temp1], %[temp2] \n\t" \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-index 68fbe85..abe97c1 100644
---- a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-@@ -285,28 +285,28 @@ static VP8LStreaks HuffmanCostCombinedCount(const uint32_t* X,
- // literal_ and successive histograms could be unaligned\r
- // so we must use ulw and usw\r
- #define ADD_TO_OUT(A, B, C, D, E, P0, P1, P2) \\r
-- "ulw %[temp0], "#A"(%["#P0"]) \n\t" \\r
-- "ulw %[temp1], "#B"(%["#P0"]) \n\t" \\r
-- "ulw %[temp2], "#C"(%["#P0"]) \n\t" \\r
-- "ulw %[temp3], "#D"(%["#P0"]) \n\t" \\r
-- "ulw %[temp4], "#A"(%["#P1"]) \n\t" \\r
-- "ulw %[temp5], "#B"(%["#P1"]) \n\t" \\r
-- "ulw %[temp6], "#C"(%["#P1"]) \n\t" \\r
-- "ulw %[temp7], "#D"(%["#P1"]) \n\t" \\r
-+ "ulw %[temp0], " #A "(%[" #P0 "]) \n\t" \\r
-+ "ulw %[temp1], " #B "(%[" #P0 "]) \n\t" \\r
-+ "ulw %[temp2], " #C "(%[" #P0 "]) \n\t" \\r
-+ "ulw %[temp3], " #D "(%[" #P0 "]) \n\t" \\r
-+ "ulw %[temp4], " #A "(%[" #P1 "]) \n\t" \\r
-+ "ulw %[temp5], " #B "(%[" #P1 "]) \n\t" \\r
-+ "ulw %[temp6], " #C "(%[" #P1 "]) \n\t" \\r
-+ "ulw %[temp7], " #D "(%[" #P1 "]) \n\t" \\r
- "addu %[temp4], %[temp4], %[temp0] \n\t" \\r
- "addu %[temp5], %[temp5], %[temp1] \n\t" \\r
- "addu %[temp6], %[temp6], %[temp2] \n\t" \\r
- "addu %[temp7], %[temp7], %[temp3] \n\t" \\r
-- "addiu %["#P0"], %["#P0"], 16 \n\t" \\r
-- ".if "#E" == 1 \n\t" \\r
-- "addiu %["#P1"], %["#P1"], 16 \n\t" \\r
-+ "addiu %[" #P0 "], %[" #P0 "], 16 \n\t" \\r
-+ ".if " #E " == 1 \n\t" \\r
-+ "addiu %[" #P1 "], %[" #P1 "], 16 \n\t" \\r
- ".endif \n\t" \\r
-- "usw %[temp4], "#A"(%["#P2"]) \n\t" \\r
-- "usw %[temp5], "#B"(%["#P2"]) \n\t" \\r
-- "usw %[temp6], "#C"(%["#P2"]) \n\t" \\r
-- "usw %[temp7], "#D"(%["#P2"]) \n\t" \\r
-- "addiu %["#P2"], %["#P2"], 16 \n\t" \\r
-- "bne %["#P0"], %[LoopEnd], 1b \n\t" \\r
-+ "usw %[temp4], " #A "(%[" #P2 "]) \n\t" \\r
-+ "usw %[temp5], " #B "(%[" #P2 "]) \n\t" \\r
-+ "usw %[temp6], " #C "(%[" #P2 "]) \n\t" \\r
-+ "usw %[temp7], " #D "(%[" #P2 "]) \n\t" \\r
-+ "addiu %[" #P2 "], %[" #P2 "], 16 \n\t" \\r
-+ "bne %[" #P0 "], %[LoopEnd], 1b \n\t" \\r
- ".set pop \n\t" \\r
- \r
- #define ASM_END_COMMON_0 \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-index 821cda9..31ac181 100644
---- a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-@@ -29,14 +29,14 @@ static void FUNC_NAME(const TYPE* src, \
- for (x = 0; x < (width >> 2); ++x) { \\r
- int tmp1, tmp2, tmp3, tmp4; \\r
- __asm__ volatile ( \\r
-- ".ifc "#TYPE", uint8_t \n\t" \\r
-+ ".ifc " #TYPE ", uint8_t \n\t" \\r
- "lbu %[tmp1], 0(%[src]) \n\t" \\r
- "lbu %[tmp2], 1(%[src]) \n\t" \\r
- "lbu %[tmp3], 2(%[src]) \n\t" \\r
- "lbu %[tmp4], 3(%[src]) \n\t" \\r
- "addiu %[src], %[src], 4 \n\t" \\r
- ".endif \n\t" \\r
-- ".ifc "#TYPE", uint32_t \n\t" \\r
-+ ".ifc " #TYPE ", uint32_t \n\t" \\r
- "lw %[tmp1], 0(%[src]) \n\t" \\r
- "lw %[tmp2], 4(%[src]) \n\t" \\r
- "lw %[tmp3], 8(%[src]) \n\t" \\r
-@@ -55,7 +55,7 @@ static void FUNC_NAME(const TYPE* src, \
- "lwx %[tmp2], %[tmp2](%[color_map]) \n\t" \\r
- "lwx %[tmp3], %[tmp3](%[color_map]) \n\t" \\r
- "lwx %[tmp4], %[tmp4](%[color_map]) \n\t" \\r
-- ".ifc "#TYPE", uint8_t \n\t" \\r
-+ ".ifc " #TYPE ", uint8_t \n\t" \\r
- "ext %[tmp1], %[tmp1], 8, 8 \n\t" \\r
- "ext %[tmp2], %[tmp2], 8, 8 \n\t" \\r
- "ext %[tmp3], %[tmp3], 8, 8 \n\t" \\r
-@@ -66,7 +66,7 @@ static void FUNC_NAME(const TYPE* src, \
- "sb %[tmp4], 3(%[dst]) \n\t" \\r
- "addiu %[dst], %[dst], 4 \n\t" \\r
- ".endif \n\t" \\r
-- ".ifc "#TYPE", uint32_t \n\t" \\r
-+ ".ifc " #TYPE ", uint32_t \n\t" \\r
- "sw %[tmp1], 0(%[dst]) \n\t" \\r
- "sw %[tmp2], 4(%[dst]) \n\t" \\r
- "sw %[tmp3], 8(%[dst]) \n\t" \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-index a7864a0..cb3adfe 100644
---- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-@@ -34,15 +34,15 @@
- G = G - t2 + kGCst; \\r
- B = B + kBCst; \\r
- __asm__ volatile ( \\r
-- "shll_s.w %["#R"], %["#R"], 9 \n\t" \\r
-- "shll_s.w %["#G"], %["#G"], 9 \n\t" \\r
-- "shll_s.w %["#B"], %["#B"], 9 \n\t" \\r
-- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \\r
-- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \\r
-- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \\r
-- "srl %["#R"], %["#R"], 24 \n\t" \\r
-- "srl %["#G"], %["#G"], 24 \n\t" \\r
-- "srl %["#B"], %["#B"], 24 \n\t" \\r
-+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \\r
-+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \\r
-+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \\r
-+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \\r
-+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \\r
-+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \\r
-+ "srl %[" #R "], %[" #R "], 24 \n\t" \\r
-+ "srl %[" #G "], %[" #G "], 24 \n\t" \\r
-+ "srl %[" #B "], %[" #B "], 24 \n\t" \\r
- : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \\r
- : \\r
- ); \\r
-diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-index 66adde5..51cbe9e 100644
---- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-@@ -39,12 +39,12 @@
- "addu %[temp5], %[temp0], %[temp1] \n\t" \\r
- "subu %[temp6], %[temp0], %[temp2] \n\t" \\r
- "addu %[temp7], %[temp0], %[temp4] \n\t" \\r
--".if "#K" \n\t" \\r
-+".if " #K " \n\t" \\r
- "lbu %[temp0], 1(%[y]) \n\t" \\r
- ".endif \n\t" \\r
- "shll_s.w %[temp5], %[temp5], 9 \n\t" \\r
- "shll_s.w %[temp6], %[temp6], 9 \n\t" \\r
--".if "#K" \n\t" \\r
-+".if " #K " \n\t" \\r
- "mul %[temp0], %[t_con_5], %[temp0] \n\t" \\r
- ".endif \n\t" \\r
- "shll_s.w %[temp7], %[temp7], 9 \n\t" \\r
-@@ -54,9 +54,9 @@
- "srl %[temp5], %[temp5], 24 \n\t" \\r
- "srl %[temp6], %[temp6], 24 \n\t" \\r
- "srl %[temp7], %[temp7], 24 \n\t" \\r
-- "sb %[temp5], "#R"(%[dst]) \n\t" \\r
-- "sb %[temp6], "#G"(%[dst]) \n\t" \\r
-- "sb %[temp7], "#B"(%[dst]) \n\t" \\r
-+ "sb %[temp5], " #R "(%[dst]) \n\t" \\r
-+ "sb %[temp6], " #G "(%[dst]) \n\t" \\r
-+ "sb %[temp7], " #B "(%[dst]) \n\t" \\r
- \r
- #define ASM_CLOBBER_LIST() \\r
- : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \\r
---
-2.1.4
-
+++ /dev/null
-From d8f40eabb25953bff5d90017478dc59d586346d1 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 3 May 2018 15:44:14 +0200
-Subject: [PATCH] Manage powf64 with glibc
-
-powf64 is now included in latest version of glibc so rename powf64 into
-powf_64
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- Source/LibRawLite/dcraw/dcraw.c | 108 ++++++++++++++--------------
- Source/LibRawLite/internal/dcraw_common.cpp | 108 ++++++++++++++--------------
- 2 files changed, 108 insertions(+), 108 deletions(-)
-
-diff --git a/Source/LibRawLite/dcraw/dcraw.c b/Source/LibRawLite/dcraw/dcraw.c
-index 6bf607d..3e52cec 100644
---- a/Source/LibRawLite/dcraw/dcraw.c
-+++ b/Source/LibRawLite/dcraw/dcraw.c
-@@ -6727,7 +6727,7 @@ static float powf_lim(float a, float b, float limup)
- {\r
- return (b>limup || b < -limup)?0.f:powf(a,b);\r
- }\r
--static float powf64(float a, float b)\r
-+static float powf_64(float a, float b)\r
- {\r
- return powf_lim(a,b,64.f);\r
- }\r
-@@ -6764,7 +6764,7 @@ static float _CanonConvert2EV(short in)
- static float _CanonConvertAperture(short in)\r
- {\r
- if (in == (short)0xffe0) return 0.0f;\r
-- else return powf64(2.0f, _CanonConvert2EV(in) / 2.0f);\r
-+ else return powf_64(2.0f, _CanonConvert2EV(in) / 2.0f);\r
- }\r
- \r
- void CLASS setCanonBodyFeatures (unsigned id)\r
-@@ -7046,15 +7046,15 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len)
- imgdata.lens.nikon.NikonLensIDNumber = LensData[i];\r
- imgdata.lens.nikon.NikonLensFStops = LensData[i + 1];\r
- imgdata.lens.makernotes.LensFStops = (float)imgdata.lens.nikon.NikonLensFStops /12.0f;\r
-- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f);\r
-- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f);\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f);\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f);\r
-+ imgdata.lens.makernotes.MinFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 2] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 3] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(2.0f, (float)LensData[i + 4] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(2.0f, (float)LensData[i + 5] / 24.0f);\r
- imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6];\r
- if (i != 2)\r
- {\r
-- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f);\r
-- imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f);\r
-+ imgdata.lens.makernotes.CurFocal = 5.0f * powf_64(2.0f, (float)LensData[i - 1] / 24.0f);\r
-+ imgdata.lens.nikon.NikonEffectiveMaxAp = powf_64(2.0f, (float)LensData[i + 7] / 24.0f);\r
- }\r
- imgdata.lens.makernotes.LensID =\r
- (unsigned long long) LensData[i] << 56 |\r
-@@ -7563,11 +7563,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id)
- {\r
- if (buf[0])\r
- imgdata.lens.makernotes.MaxAp =\r
-- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
-+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
- \r
- if (buf[1])\r
- imgdata.lens.makernotes.MinAp =\r
-- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
-+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
- }\r
- \r
- if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens)\r
-@@ -7577,7 +7577,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id)
- lid = SonySubstitution[buf[0x3d]] << 8 |\r
- SonySubstitution[buf[0x3c]];\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f);\r
-+ powf_64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f);\r
- }\r
- if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF))\r
- imgdata.lens.makernotes.LensMount =\r
-@@ -7957,7 +7957,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- {\r
- unsigned char cc;\r
- fread(&cc, 1, 1, ifp);\r
-- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0));\r
-+ iso_speed = (int)(100.0 * powf_64(2.0, (double)(cc) / 12.0 - 5.0));\r
- break;\r
- }\r
- }\r
-@@ -7989,7 +7989,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- }\r
- break;\r
- case 0x1002:\r
-- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2);\r
-+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2);\r
- break;\r
- case 0x20100201:\r
- imgdata.lens.makernotes.LensID =\r
-@@ -8009,10 +8009,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- fread(imgdata.lens.makernotes.Lens, len, 1, ifp);\r
- break;\r
- case 0x20100205:\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100206:\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100207:\r
- imgdata.lens.makernotes.MinFocal = (float)get2();\r
-@@ -8023,7 +8023,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal;\r
- break;\r
- case 0x2010020a:\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100301:\r
- imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8;\r
-@@ -8121,13 +8121,13 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- if (table_buf[iLensData+9] &&\r
- (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f))\r
- imgdata.lens.makernotes.CurFocal =\r
-- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2);\r
-+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2);\r
- if (table_buf[iLensData+10] & 0xf0)\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
- if (table_buf[iLensData+10] & 0x0f)\r
- imgdata.lens.makernotes.MinAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
- if (\r
- (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r\r
- (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
-@@ -8148,14 +8148,14 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- if ((table_buf[iLensData+14] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
- }\r
- else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
- (table_buf[iLensData+15] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- {\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
- }\r
- }\r
- free(table_buf);\r
-@@ -8321,7 +8321,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- lid = (((ushort)table_buf[2])<<8) |\r
- ((ushort)table_buf[3]);\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
-+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
- }\r
- break;\r
- case 1536:\r
-@@ -8801,7 +8801,7 @@ void CLASS parse_makernote (int base, int uptag)
- }\r
- break;\r
- case 0x1002:\r
-- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2);\r
-+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2);\r
- break;\r
- case 0x20100201:\r
- imgdata.lens.makernotes.LensID =\r
-@@ -8821,10 +8821,10 @@ void CLASS parse_makernote (int base, int uptag)
- fread(imgdata.lens.makernotes.Lens, len, 1, ifp);\r
- break;\r
- case 0x20100205:\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100206:\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100207:\r
- imgdata.lens.makernotes.MinFocal = (float)get2();\r
-@@ -8835,7 +8835,7 @@ void CLASS parse_makernote (int base, int uptag)
- imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal;\r
- break;\r
- case 0x2010020a:\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100301:\r
- imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8;\r
-@@ -8993,13 +8993,13 @@ void CLASS parse_makernote (int base, int uptag)
- {\r
- if (table_buf[iLensData+9] && (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f))\r
- imgdata.lens.makernotes.CurFocal =\r
-- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2);\r
-+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2);\r
- if (table_buf[iLensData+10] & 0xf0)\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
- if (table_buf[iLensData+10] & 0x0f)\r
- imgdata.lens.makernotes.MinAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
- if (\r
- (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r\r
- (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
-@@ -9020,14 +9020,14 @@ void CLASS parse_makernote (int base, int uptag)
- if ((table_buf[iLensData+14] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
- }\r
- else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
- (table_buf[iLensData+15] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- {\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
- }\r
- }\r
- free(table_buf);\r
-@@ -9188,7 +9188,7 @@ void CLASS parse_makernote (int base, int uptag)
- lid = (((ushort)table_buf[2])<<8) |\r
- ((ushort)table_buf[3]);\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
-+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
- }\r
- break;\r
- case 1536:\r
-@@ -9273,15 +9273,15 @@ void CLASS parse_makernote (int base, int uptag)
- {\r
- unsigned char cc;\r
- fread(&cc,1,1,ifp);\r
-- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0));\r
-+ iso_speed = int(100.0 * powf_64(2.0f,float(cc)/12.0-5.0));\r
- }\r
- if (tag == 4 && len > 26 && len < 35) {\r
- if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535))\r
-- iso_speed = 50 * powf64(2.0, i/32.0 - 4);\r
-+ iso_speed = 50 * powf_64(2.0, i/32.0 - 4);\r
- if ((i=(get2(),get2())) != 0x7fff && !aperture)\r
-- aperture = powf64(2.0, i/64.0);\r
-+ aperture = powf_64(2.0, i/64.0);\r
- if ((i=get2()) != 0xffff && !shutter)\r
-- shutter = powf64(2.0, (short) i/-32.0);\r
-+ shutter = powf_64(2.0, (short) i/-32.0);\r
- wbi = (get2(),get2());\r
- shot_order = (get2(),get2());\r
- }\r
-@@ -9732,7 +9732,7 @@ void CLASS parse_exif (int base)
- imgdata.lens.Lens[0] = 0;\r
- break;\r
- case 0x9205:\r
-- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f));\r
- break;\r
- #endif\r
- case 33434: shutter = getreal(type); break;\r
-@@ -9745,10 +9745,10 @@ void CLASS parse_exif (int base)
- case 36867:\r
- case 36868: get_timestamp(0); break;\r
- case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.)\r
-- shutter = powf64(2.0, expo); break;\r
-+ shutter = powf_64(2.0, expo); break;\r
- case 37378:\r
- if (fabs(ape = getreal(type))<256.0)\r
-- aperture = powf64(2.0, ape/2);\r
-+ aperture = powf_64(2.0, ape/2);\r
- break;\r
- case 37385: flash_used = getreal(type); break;\r
- case 37386: focal_len = getreal(type); break;\r
-@@ -10361,7 +10361,7 @@ int CLASS parse_tiff_ifd (int base)
- imgdata.lens.Lens[0] = 0;\r
- break;\r
- case 0x9205:\r
-- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f));\r
- break;\r
- // IB end\r
- #endif\r
-@@ -11130,22 +11130,22 @@ void CLASS parse_ciff (int offset, int length, int depth)
- thumb_length = len;\r
- }\r
- if (type == 0x1818) {\r
-- shutter = powf64(2.0f, -int_to_float((get4(),get4())));\r
-- aperture = powf64(2.0f, int_to_float(get4())/2);\r
-+ shutter = powf_64(2.0f, -int_to_float((get4(),get4())));\r
-+ aperture = powf_64(2.0f, int_to_float(get4())/2);\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- imgdata.lens.makernotes.CurAp = aperture;\r
- #endif\r
- }\r
- if (type == 0x102a) {\r
- // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50;\r
-- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f;\r
-+ iso_speed = powf_64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f;\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- aperture = _CanonConvertAperture((get2(),get2()));\r
- imgdata.lens.makernotes.CurAp = aperture;\r
- #else\r
-- aperture = powf64(2.0, (get2(),(short)get2())/64.0);\r
-+ aperture = powf_64(2.0, (get2(),(short)get2())/64.0);\r
- #endif\r
-- shutter = powf64(2.0,-((short)get2())/32.0);\r
-+ shutter = powf_64(2.0,-((short)get2())/32.0);\r
- wbi = (get2(),get2());\r
- if (wbi > 17) wbi = 0;\r
- fseek (ifp, 32, SEEK_CUR);\r
-@@ -11349,8 +11349,8 @@ void CLASS parse_phase_one (int base)
- setPhaseOneFeatures(unique_id);\r
- break;\r
- case 0x0401:\r
-- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f));\r
-- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f));\r
-+ if (type == 4) imgdata.lens.makernotes.CurAp = powf_64(2.0f, (int_to_float(data)/2.0f));\r
-+ else imgdata.lens.makernotes.CurAp = powf_64(2.0f, (getreal(type)/2.0f));\r
- break;\r
- case 0x0403:\r
- if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data);\r
-@@ -11364,16 +11364,16 @@ void CLASS parse_phase_one (int base)
- break;\r
- case 0x0414:\r
- if (type == 4) {\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f));\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f));\r
- } else {\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f));\r
- }\r
- break;\r
- case 0x0415:\r
- if (type == 4) {\r
-- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f));\r
-+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f));\r
- } else {\r
-- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f));\r
- }\r
- break;\r
- case 0x0416:\r
-@@ -13324,15 +13324,15 @@ void CLASS identify()
- case 18: iso_speed = 320; break;\r
- case 19: iso_speed = 400; break;\r
- }\r
-- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f;\r
-+ shutter = powf_64(2.0f, (((float)get4())/8.0f)) / 16000.0f;\r
- FORC4 cam_mul[c ^ (c >> 1)] = get4();\r
- fseek (ifp, 88, SEEK_SET);\r
-- aperture = powf64(2.0f, ((float)get4())/16.0f);\r
-+ aperture = powf_64(2.0f, ((float)get4())/16.0f);\r
- fseek (ifp, 112, SEEK_SET);\r
- focal_len = get4();\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- fseek (ifp, 104, SEEK_SET);\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, ((float)get4())/16.0f);\r
- fseek (ifp, 124, SEEK_SET);\r
- fread(imgdata.lens.makernotes.Lens, 32, 1, ifp);\r
- imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N;\r
-diff --git a/Source/LibRawLite/internal/dcraw_common.cpp b/Source/LibRawLite/internal/dcraw_common.cpp
-index a936a93..0fc4d81 100644
---- a/Source/LibRawLite/internal/dcraw_common.cpp
-+++ b/Source/LibRawLite/internal/dcraw_common.cpp
-@@ -5543,7 +5543,7 @@ static float powf_lim(float a, float b, float limup)
- {\r
- return (b>limup || b < -limup)?0.f:powf(a,b);\r
- }\r
--static float powf64(float a, float b)\r
-+static float powf_64(float a, float b)\r
- {\r
- return powf_lim(a,b,64.f);\r
- }\r
-@@ -5580,7 +5580,7 @@ static float _CanonConvert2EV(short in)
- static float _CanonConvertAperture(short in)\r
- {\r
- if (in == (short)0xffe0) return 0.0f;\r
-- else return powf64(2.0f, _CanonConvert2EV(in) / 2.0f);\r
-+ else return powf_64(2.0f, _CanonConvert2EV(in) / 2.0f);\r
- }\r
- \r
- void CLASS setCanonBodyFeatures (unsigned id)\r
-@@ -5862,15 +5862,15 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len)
- imgdata.lens.nikon.NikonLensIDNumber = LensData[i];\r
- imgdata.lens.nikon.NikonLensFStops = LensData[i + 1];\r
- imgdata.lens.makernotes.LensFStops = (float)imgdata.lens.nikon.NikonLensFStops /12.0f;\r
-- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f);\r
-- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f);\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f);\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f);\r
-+ imgdata.lens.makernotes.MinFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 2] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxFocal = 5.0f * powf_64(2.0f, (float)LensData[i + 3] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(2.0f, (float)LensData[i + 4] / 24.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(2.0f, (float)LensData[i + 5] / 24.0f);\r
- imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6];\r
- if (i != 2)\r
- {\r
-- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f);\r
-- imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f);\r
-+ imgdata.lens.makernotes.CurFocal = 5.0f * powf_64(2.0f, (float)LensData[i - 1] / 24.0f);\r
-+ imgdata.lens.nikon.NikonEffectiveMaxAp = powf_64(2.0f, (float)LensData[i + 7] / 24.0f);\r
- }\r
- imgdata.lens.makernotes.LensID =\r
- (unsigned long long) LensData[i] << 56 |\r
-@@ -6379,11 +6379,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id)
- {\r
- if (buf[0])\r
- imgdata.lens.makernotes.MaxAp =\r
-- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
-+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
- \r
- if (buf[1])\r
- imgdata.lens.makernotes.MinAp =\r
-- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
-+ my_roundf(powf_64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f;\r
- }\r
- \r
- if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens)\r
-@@ -6393,7 +6393,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id)
- lid = SonySubstitution[buf[0x3d]] << 8 |\r
- SonySubstitution[buf[0x3c]];\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f);\r
-+ powf_64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f);\r
- }\r
- if (buf[0x105] && (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF))\r
- imgdata.lens.makernotes.LensMount =\r
-@@ -6773,7 +6773,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- {\r
- unsigned char cc;\r
- fread(&cc, 1, 1, ifp);\r
-- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0));\r
-+ iso_speed = (int)(100.0 * powf_64(2.0, (double)(cc) / 12.0 - 5.0));\r
- break;\r
- }\r
- }\r
-@@ -6805,7 +6805,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- }\r
- break;\r
- case 0x1002:\r
-- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2);\r
-+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2);\r
- break;\r
- case 0x20100201:\r
- imgdata.lens.makernotes.LensID =\r
-@@ -6825,10 +6825,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- fread(imgdata.lens.makernotes.Lens, len, 1, ifp);\r
- break;\r
- case 0x20100205:\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100206:\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100207:\r
- imgdata.lens.makernotes.MinFocal = (float)get2();\r
-@@ -6839,7 +6839,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal;\r
- break;\r
- case 0x2010020a:\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100301:\r
- imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8;\r
-@@ -6937,13 +6937,13 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- if (table_buf[iLensData+9] &&\r
- (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f))\r
- imgdata.lens.makernotes.CurFocal =\r
-- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2);\r
-+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2);\r
- if (table_buf[iLensData+10] & 0xf0)\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
- if (table_buf[iLensData+10] & 0x0f)\r
- imgdata.lens.makernotes.MinAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
- if (\r
- (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r\r
- (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
-@@ -6964,14 +6964,14 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- if ((table_buf[iLensData+14] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
- }\r
- else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
- (table_buf[iLensData+15] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- {\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
- }\r
- }\r
- free(table_buf);\r
-@@ -7137,7 +7137,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer)
- lid = (((ushort)table_buf[2])<<8) |\r
- ((ushort)table_buf[3]);\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
-+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
- }\r
- break;\r
- case 1536:\r
-@@ -7617,7 +7617,7 @@ void CLASS parse_makernote (int base, int uptag)
- }\r
- break;\r
- case 0x1002:\r
-- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2);\r
-+ imgdata.lens.makernotes.CurAp = powf_64(2.0f, getreal(type)/2);\r
- break;\r
- case 0x20100201:\r
- imgdata.lens.makernotes.LensID =\r
-@@ -7637,10 +7637,10 @@ void CLASS parse_makernote (int base, int uptag)
- fread(imgdata.lens.makernotes.Lens, len, 1, ifp);\r
- break;\r
- case 0x20100205:\r
-- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MinFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100206:\r
-- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4MaxFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100207:\r
- imgdata.lens.makernotes.MinFocal = (float)get2();\r
-@@ -7651,7 +7651,7 @@ void CLASS parse_makernote (int base, int uptag)
- imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal;\r
- break;\r
- case 0x2010020a:\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(sqrt(2.0f), get2() / 256.0f);\r
- break;\r
- case 0x20100301:\r
- imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8;\r
-@@ -7809,13 +7809,13 @@ void CLASS parse_makernote (int base, int uptag)
- {\r
- if (table_buf[iLensData+9] && (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f))\r
- imgdata.lens.makernotes.CurFocal =\r
-- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2);\r
-+ 10*(table_buf[iLensData+9]>>2) * powf_64(4, (table_buf[iLensData+9] & 0x03)-2);\r
- if (table_buf[iLensData+10] & 0xf0)\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);\r
- if (table_buf[iLensData+10] & 0x0f)\r
- imgdata.lens.makernotes.MinAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f);\r
- if (\r
- (imgdata.lens.makernotes.CamID != 0x12e6c) && // K-r\r
- (imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
-@@ -7836,14 +7836,14 @@ void CLASS parse_makernote (int base, int uptag)
- if ((table_buf[iLensData+14] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f);\r
- }\r
- else if ((imgdata.lens.makernotes.CamID != 0x12e76) && // K-5\r
- (table_buf[iLensData+15] > 1) &&\r
- (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f))\r
- {\r
- imgdata.lens.makernotes.MaxAp4CurFocal =\r
-- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
-+ powf_64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f);\r
- }\r
- }\r
- free(table_buf);\r
-@@ -8004,7 +8004,7 @@ void CLASS parse_makernote (int base, int uptag)
- lid = (((ushort)table_buf[2])<<8) |\r
- ((ushort)table_buf[3]);\r
- imgdata.lens.makernotes.CurAp =\r
-- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
-+ powf_64(2.0f, ((float)lid/8.0f-1.0f)/2.0f);\r
- }\r
- break;\r
- case 1536:\r
-@@ -8089,15 +8089,15 @@ void CLASS parse_makernote (int base, int uptag)
- {\r
- unsigned char cc;\r
- fread(&cc,1,1,ifp);\r
-- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0));\r
-+ iso_speed = int(100.0 * powf_64(2.0f,float(cc)/12.0-5.0));\r
- }\r
- if (tag == 4 && len > 26 && len < 35) {\r
- if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535))\r
-- iso_speed = 50 * powf64(2.0, i/32.0 - 4);\r
-+ iso_speed = 50 * powf_64(2.0, i/32.0 - 4);\r
- if ((i=(get2(),get2())) != 0x7fff && !aperture)\r
-- aperture = powf64(2.0, i/64.0);\r
-+ aperture = powf_64(2.0, i/64.0);\r
- if ((i=get2()) != 0xffff && !shutter)\r
-- shutter = powf64(2.0, (short) i/-32.0);\r
-+ shutter = powf_64(2.0, (short) i/-32.0);\r
- wbi = (get2(),get2());\r
- shot_order = (get2(),get2());\r
- }\r
-@@ -8548,7 +8548,7 @@ void CLASS parse_exif (int base)
- imgdata.lens.Lens[0] = 0;\r
- break;\r
- case 0x9205:\r
-- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f));\r
- break;\r
- #endif\r
- case 33434: shutter = getreal(type); break;\r
-@@ -8561,10 +8561,10 @@ void CLASS parse_exif (int base)
- case 36867:\r
- case 36868: get_timestamp(0); break;\r
- case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.)\r
-- shutter = powf64(2.0, expo); break;\r
-+ shutter = powf_64(2.0, expo); break;\r
- case 37378:\r
- if (fabs(ape = getreal(type))<256.0)\r
-- aperture = powf64(2.0, ape/2);\r
-+ aperture = powf_64(2.0, ape/2);\r
- break;\r
- case 37385: flash_used = getreal(type); break;\r
- case 37386: focal_len = getreal(type); break;\r
-@@ -9171,7 +9171,7 @@ int CLASS parse_tiff_ifd (int base)
- imgdata.lens.Lens[0] = 0;\r
- break;\r
- case 0x9205:\r
-- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.EXIF_MaxAp = powf_64(2.0f, (getreal(type) / 2.0f));\r
- break;\r
- // IB end\r
- #endif\r
-@@ -9940,22 +9940,22 @@ void CLASS parse_ciff (int offset, int length, int depth)
- thumb_length = len;\r
- }\r
- if (type == 0x1818) {\r
-- shutter = powf64(2.0f, -int_to_float((get4(),get4())));\r
-- aperture = powf64(2.0f, int_to_float(get4())/2);\r
-+ shutter = powf_64(2.0f, -int_to_float((get4(),get4())));\r
-+ aperture = powf_64(2.0f, int_to_float(get4())/2);\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- imgdata.lens.makernotes.CurAp = aperture;\r
- #endif\r
- }\r
- if (type == 0x102a) {\r
- // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50;\r
-- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f;\r
-+ iso_speed = powf_64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f;\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- aperture = _CanonConvertAperture((get2(),get2()));\r
- imgdata.lens.makernotes.CurAp = aperture;\r
- #else\r
-- aperture = powf64(2.0, (get2(),(short)get2())/64.0);\r
-+ aperture = powf_64(2.0, (get2(),(short)get2())/64.0);\r
- #endif\r
-- shutter = powf64(2.0,-((short)get2())/32.0);\r
-+ shutter = powf_64(2.0,-((short)get2())/32.0);\r
- wbi = (get2(),get2());\r
- if (wbi > 17) wbi = 0;\r
- fseek (ifp, 32, SEEK_CUR);\r
-@@ -10159,8 +10159,8 @@ void CLASS parse_phase_one (int base)
- setPhaseOneFeatures(unique_id);\r
- break;\r
- case 0x0401:\r
-- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f));\r
-- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f));\r
-+ if (type == 4) imgdata.lens.makernotes.CurAp = powf_64(2.0f, (int_to_float(data)/2.0f));\r
-+ else imgdata.lens.makernotes.CurAp = powf_64(2.0f, (getreal(type)/2.0f));\r
- break;\r
- case 0x0403:\r
- if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data);\r
-@@ -10174,16 +10174,16 @@ void CLASS parse_phase_one (int base)
- break;\r
- case 0x0414:\r
- if (type == 4) {\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f));\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f));\r
- } else {\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f));\r
- }\r
- break;\r
- case 0x0415:\r
- if (type == 4) {\r
-- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f));\r
-+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (int_to_float(data)/2.0f));\r
- } else {\r
-- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f));\r
-+ imgdata.lens.makernotes.MinAp4CurFocal = powf_64(2.0f, (getreal(type) / 2.0f));\r
- }\r
- break;\r
- case 0x0416:\r
-@@ -11996,15 +11996,15 @@ void CLASS identify()
- case 18: iso_speed = 320; break;\r
- case 19: iso_speed = 400; break;\r
- }\r
-- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f;\r
-+ shutter = powf_64(2.0f, (((float)get4())/8.0f)) / 16000.0f;\r
- FORC4 cam_mul[c ^ (c >> 1)] = get4();\r
- fseek (ifp, 88, SEEK_SET);\r
-- aperture = powf64(2.0f, ((float)get4())/16.0f);\r
-+ aperture = powf_64(2.0f, ((float)get4())/16.0f);\r
- fseek (ifp, 112, SEEK_SET);\r
- focal_len = get4();\r
- #ifdef LIBRAW_LIBRARY_BUILD\r
- fseek (ifp, 104, SEEK_SET);\r
-- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f);\r
-+ imgdata.lens.makernotes.MaxAp4CurFocal = powf_64(2.0f, ((float)get4())/16.0f);\r
- fseek (ifp, 124, SEEK_SET);\r
- fread(imgdata.lens.makernotes.Lens, 32, 1, ifp);\r
- imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N;\r
---
-2.14.1
-
projects / buildroot.git / commitdiff