Normalize line endings and whitespace

This commit is contained in:
OpenCV Buildbot
2012-10-17 11:12:04 +04:00
committed by Andrey Kamaev
parent 0442bca235
commit 81f826db2b
1511 changed files with 258678 additions and 258624 deletions

View File

@@ -6,15 +6,15 @@
*/
/* __START_OF_JASPER_LICENSE__
*
*
* JasPer License Version 2.0
*
*
* Copyright (c) 2001-2006 Michael David Adams
* Copyright (c) 1999-2000 Image Power, Inc.
* Copyright (c) 1999-2000 The University of British Columbia
*
*
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person (the
* "User") obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without restriction,
@@ -22,15 +22,15 @@
* publish, distribute, and/or sell copies of the Software, and to permit
* persons to whom the Software is furnished to do so, subject to the
* following conditions:
*
*
* 1. The above copyright notices and this permission notice (which
* includes the disclaimer below) shall be included in all copies or
* substantial portions of the Software.
*
*
* 2. The name of a copyright holder shall not be used to endorse or
* promote products derived from the Software without specific prior
* written permission.
*
*
* THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
* LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
* THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
@@ -57,7 +57,7 @@
* PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
* RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
* EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
*
*
* __END_OF_JASPER_LICENSE__
*/
@@ -90,105 +90,105 @@
int jpc_atoaf(char *s, int *numvalues, double **values)
{
static char delim[] = ", \t\n";
char buf[4096];
int n;
double *vs;
char *cp;
static char delim[] = ", \t\n";
char buf[4096];
int n;
double *vs;
char *cp;
strncpy(buf, s, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
n = 0;
if ((cp = strtok(buf, delim))) {
++n;
while ((cp = strtok(0, delim))) {
if (cp != '\0') {
++n;
}
}
}
strncpy(buf, s, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
n = 0;
if ((cp = strtok(buf, delim))) {
++n;
while ((cp = strtok(0, delim))) {
if (cp != '\0') {
++n;
}
}
}
if (n) {
if (!(vs = jas_alloc2(n, sizeof(double)))) {
return -1;
}
if (n) {
if (!(vs = jas_alloc2(n, sizeof(double)))) {
return -1;
}
strncpy(buf, s, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
n = 0;
if ((cp = strtok(buf, delim))) {
vs[n] = atof(cp);
++n;
while ((cp = strtok(0, delim))) {
if (cp != '\0') {
vs[n] = atof(cp);
++n;
}
}
}
} else {
vs = 0;
}
strncpy(buf, s, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
n = 0;
if ((cp = strtok(buf, delim))) {
vs[n] = atof(cp);
++n;
while ((cp = strtok(0, delim))) {
if (cp != '\0') {
vs[n] = atof(cp);
++n;
}
}
}
} else {
vs = 0;
}
*numvalues = n;
*values = vs;
*numvalues = n;
*values = vs;
return 0;
return 0;
}
jas_seq_t *jpc_seq_upsample(jas_seq_t *x, int m)
{
jas_seq_t *z;
int i;
jas_seq_t *z;
int i;
if (!(z = jas_seq_create(jas_seq_start(x) * m, (jas_seq_end(x) - 1) * m + 1)))
return 0;
for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
*jas_seq_getref(z, i) = (!JAS_MOD(i, m)) ? jas_seq_get(x, i / m) :
jpc_inttofix(0);
}
if (!(z = jas_seq_create(jas_seq_start(x) * m, (jas_seq_end(x) - 1) * m + 1)))
return 0;
for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
*jas_seq_getref(z, i) = (!JAS_MOD(i, m)) ? jas_seq_get(x, i / m) :
jpc_inttofix(0);
}
return z;
return z;
}
jpc_fix_t jpc_seq_norm(jas_seq_t *x)
{
jpc_fix_t s;
int i;
jpc_fix_t s;
int i;
s = jpc_inttofix(0);
for (i = jas_seq_start(x); i < jas_seq_end(x); i++) {
s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(x, i), jas_seq_get(x, i)));
}
s = jpc_inttofix(0);
for (i = jas_seq_start(x); i < jas_seq_end(x); i++) {
s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(x, i), jas_seq_get(x, i)));
}
return jpc_dbltofix(sqrt(jpc_fixtodbl(s)));
return jpc_dbltofix(sqrt(jpc_fixtodbl(s)));
}
jas_seq_t *jpc_seq_conv(jas_seq_t *x, jas_seq_t *y)
{
int i;
int j;
int k;
jas_seq_t *z;
jpc_fix_t s;
jpc_fix_t v;
int i;
int j;
int k;
jas_seq_t *z;
jpc_fix_t s;
jpc_fix_t v;
z = jas_seq_create(jas_seq_start(x) + jas_seq_start(y),
jas_seq_end(x) + jas_seq_end(y) - 1);
assert(z);
for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
s = jpc_inttofix(0);
for (j = jas_seq_start(y); j < jas_seq_end(y); j++) {
k = i - j;
if (k < jas_seq_start(x) || k >= jas_seq_end(x)) {
v = JPC_FIX_ZERO;
} else {
v = jas_seq_get(x, k);
}
s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(y, j), v));
}
*jas_seq_getref(z, i) = s;
}
z = jas_seq_create(jas_seq_start(x) + jas_seq_start(y),
jas_seq_end(x) + jas_seq_end(y) - 1);
assert(z);
for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
s = jpc_inttofix(0);
for (j = jas_seq_start(y); j < jas_seq_end(y); j++) {
k = i - j;
if (k < jas_seq_start(x) || k >= jas_seq_end(x)) {
v = JPC_FIX_ZERO;
} else {
v = jas_seq_get(x, k);
}
s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(y, j), v));
}
*jas_seq_getref(z, i) = s;
}
return z;
return z;
}