X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.cpp;h=7e44e9ba89424477a33370020039d32f0c37d723;hp=5ea5fe4bd91f80f1d260c52baaeebbb63dabd7b7;hb=eb11109d6a074541df9b45be127c70d836bc4872;hpb=833bbfaf5387f213e6a9c355b93aa622c74ec88f

diff --git a/resample_effect.cpp b/resample_effect.cpp
index 5ea5fe4..7e44e9b 100644
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -293,18 +293,18 @@ void optimize_sum_sq_error(const Tap<float>* weights, unsigned num_weights,
 	// notation in the derivation above.
 	for (unsigned k = 0; k < num_bilinear_weights; ++k) {
 		for (int j = pos[k]; j <= pos[k] + 1; ++j) {
-			const float f_kj = (j == pos[k]) ? (1.0f - fracs[k]) : fracs[k];
+			const float w_kj = (j == pos[k]) ? (1.0f - fracs[k]) : fracs[k];
 			for (unsigned i = 0; i < num_bilinear_weights; ++i) {
-				float f_ij;
+				float w_ij;
 				if (j == pos[i]) {
-					f_ij = 1.0f - fracs[i];
+					w_ij = 1.0f - fracs[i];
 				} else if (j == pos[i] + 1) {
-					f_ij = fracs[i];
+					w_ij = fracs[i];
 				} else {
-					// f_ij = 0
+					// w_ij = 0
 					continue;
 				}
-				A.coeffRef(i, k) += f_kj * f_ij;
+				A.coeffRef(i, k) += w_kj * w_ij;
 			}
 			float c_j;
 			if (j >= c_lower_pos && j < c_upper_pos) {
@@ -312,7 +312,7 @@ void optimize_sum_sq_error(const Tap<float>* weights, unsigned num_weights,
 			} else {
 				c_j = 0.0f;
 			}
-			b.coeffRef(k) += f_kj * c_j;
+			b.coeffRef(k) += w_kj * c_j;
 		}
 	}
 	delete[] pos;