Commit 653fdd6d authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes I139808f4,I3d97d8db into nextgenv2

* changes:
  warped_motion.c: delete unused filter_4tap[]
  warped_motion.c: quiet float-conversion warnings
parents 4be3214f 5d54c175
......@@ -139,31 +139,6 @@ void project_points_homography(int16_t *mat, int *points, int *proj,
}
}
static const int16_t filter_4tap[WARPEDPIXEL_PREC_SHIFTS][4] = {
{ 0, 128, 0, 0 }, { -1, 127, 2, 0 }, { -2, 127, 4, -1 },
{ -3, 126, 6, -1 }, { -3, 125, 8, -2 }, { -4, 124, 11, -3 },
{ -5, 123, 13, -3 }, { -5, 121, 15, -3 }, { -6, 120, 18, -4 },
{ -7, 119, 20, -4 }, { -7, 118, 22, -5 }, { -8, 116, 25, -5 },
{ -8, 115, 27, -6 }, { -9, 113, 30, -6 }, { -9, 112, 32, -7 },
{ -9, 110, 34, -7 }, { -10, 108, 37, -7 }, { -10, 107, 39, -8 },
{ -10, 105, 41, -8 }, { -11, 103, 44, -8 }, { -11, 101, 47, -9 },
{ -11, 99, 49, -9 }, { -11, 97, 51, -9 }, { -11, 95, 54, -10 },
{ -11, 93, 56, -10 }, { -12, 91, 59, -10 }, { -12, 89, 61, -10 },
{ -12, 87, 64, -11 }, { -12, 85, 66, -11 }, { -12, 82, 69, -11 },
{ -12, 80, 71, -11 }, { -12, 78, 73, -11 }, { -11, 75, 75, -11 },
{ -11, 73, 78, -12 }, { -11, 71, 80, -12 }, { -11, 69, 82, -12 },
{ -11, 66, 85, -12 }, { -11, 64, 87, -12 }, { -10, 61, 89, -12 },
{ -10, 59, 91, -12 }, { -10, 56, 93, -11 }, { -10, 54, 95, -11 },
{ -9, 51, 97, -11 }, { -9, 49, 99, -11 }, { -9, 47, 101, -11 },
{ -8, 44, 103, -11 }, { -8, 41, 105, -10 }, { -8, 39, 107, -10 },
{ -7, 37, 108, -10 }, { -7, 34, 110, -9 }, { -7, 32, 112, -9 },
{ -6, 30, 113, -9 }, { -6, 27, 115, -8 }, { -5, 25, 116, -8 },
{ -5, 22, 118, -7 }, { -4, 20, 119, -7 }, { -4, 18, 120, -6 },
{ -3, 15, 121, -5 }, { -3, 13, 123, -5 }, { -3, 11, 124, -4 },
{ -2, 8, 125, -3 }, { -1, 6, 126, -3 }, { -1, 4, 127, -2 },
{ 0, 2, 127, -1 },
};
static const int16_t
filter_ntap[WARPEDPIXEL_PREC_SHIFTS][WARPEDPIXEL_FILTER_TAPS] = {
{ 0, 0, 128, 0, 0, 0 }, { 0, -1, 128, 2, -1, 0 },
......@@ -700,7 +675,7 @@ static int svdcmp(double **u, int m, int n, double w[], double **v) {
g = s = scale = 0.0;
if (i < m) {
for (k = i; k < m; k++) scale += fabs(u[k][i]);
if (scale) {
if (scale != 0.) {
for (k = i; k < m; k++) {
u[k][i] /= scale;
s += u[k][i] * u[k][i];
......@@ -721,7 +696,7 @@ static int svdcmp(double **u, int m, int n, double w[], double **v) {
g = s = scale = 0.0;
if (i < m && i != n - 1) {
for (k = l; k < n; k++) scale += fabs(u[i][k]);
if (scale) {
if (scale != 0.) {
for (k = l; k < n; k++) {
u[i][k] /= scale;
s += u[i][k] * u[i][k];
......@@ -743,7 +718,7 @@ static int svdcmp(double **u, int m, int n, double w[], double **v) {
for (i = n - 1; i >= 0; i--) {
if (i < n - 1) {
if (g) {
if (g != 0.) {
for (j = l; j < n; j++) v[j][i] = (u[i][j] / u[i][l]) / g;
for (j = l; j < n; j++) {
for (s = 0.0, k = l; k < n; k++) s += u[i][k] * v[k][j];
......@@ -760,7 +735,7 @@ static int svdcmp(double **u, int m, int n, double w[], double **v) {
l = i + 1;
g = w[i];
for (j = l; j < n; j++) u[i][j] = 0.0;
if (g) {
if (g != 0.) {
g = 1.0 / g;
for (j = l; j < n; j++) {
for (s = 0.0, k = l; k < m; k++) s += u[k][i] * u[k][j];
......@@ -848,7 +823,7 @@ static int svdcmp(double **u, int m, int n, double w[], double **v) {
}
z = pythag(f, h);
w[j] = z;
if (z) {
if (z != 0.) {
z = 1.0 / z;
c = f * z;
s = h * z;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment