[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Libcvd-members] libcvd/cvd convolution.h
From: |
Colin Starr |
Subject: |
[Libcvd-members] libcvd/cvd convolution.h |
Date: |
Tue, 23 May 2006 15:08:44 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Branch:
Changes by: Colin Starr <address@hidden> 06/05/23 15:08:43
Modified files:
cvd : convolution.h
Log message:
Fixed several function calls to match recent changes to utility.h.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/libcvd/cvd/convolution.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: libcvd/cvd/convolution.h
diff -u libcvd/cvd/convolution.h:1.4 libcvd/cvd/convolution.h:1.5
--- libcvd/cvd/convolution.h:1.4 Tue May 16 13:28:17 2006
+++ libcvd/cvd/convolution.h Tue May 23 15:08:43 2006
@@ -415,7 +415,7 @@
for (int j=0; j<n; j++)
output[j] = factor * input[j];
for (int r=0; r <ksize; r++) {
- add_mul_add(input-r-1, input+r+1, kernel[r], output, n);
+ add_multiple_of_sum<sum_type, sum_comp_type>(input-r-1, input+r+1,
kernel[r], output, n);
}
return input + n;
}
@@ -478,24 +478,24 @@
// vertical
if (i >= swin) {
const sum_type* middle_row = rows[ksize];
- assign_mul(middle_row, factor, outbuf, w);
+ assign_multiple<sum_type, sum_type>(middle_row, factor, outbuf, w);
for (int k=0; k<ksize; k++) {
const sum_comp_type m = kernel[k];
const sum_type* row1 = rows[ksize-k-1];
const sum_type* row2 = rows[ksize+k+1];
- add_mul_add(row1, row2, m, outbuf, w);
+ add_multiple_of_sum<sum_type, sum_comp_type>(row1, row2, m, outbuf, w);
}
cast_copy(outbuf, output, w);
output += w;
if (i == h-1) {
for (int r=0; r<ksize; r++) {
const sum_type* middle_row = rows[ksize+r+1];
- assign_mul(middle_row, factor, outbuf, w);
+ assign_multiple<sum_type, sum_type>(middle_row, factor, outbuf, w);
for (int k=0; k<ksize; k++) {
const sum_comp_type m = kernel[k];
const sum_type* row1 = rows[ksize+r-k];
const sum_type* row2 = rows[ksize+r+k+2 > swin ? 2*swin -
(ksize+r+k+2) : ksize+r+k+2];
- add_mul_add(row1, row2, m, outbuf, w);
+ add_multiple_of_sum<sum_type, sum_comp_type>(row1, row2, m, outbuf,
w);
}
cast_copy(outbuf, output, w);
output += w;
@@ -504,12 +504,12 @@
} else if (i == swin-1) {
for (int r=0; r<ksize; r++) {
const sum_type* middle_row = rows[r+1];
- assign_mul(middle_row, factor, outbuf, w);
+ assign_multiple<sum_type, sum_type>(middle_row, factor, outbuf, w);
for (int k=0; k<ksize; k++) {
const sum_comp_type m = kernel[k];
const sum_type* row1 = rows[abs(r-k-1)+1];
const sum_type* row2 = rows[r+k+2];
- add_mul_add(row1, row2, m, outbuf, w);
+ add_multiple_of_sum<sum_type, sum_comp_type>(row1, row2, m, outbuf,
w);
}
cast_copy(outbuf, output, w);
output += w;