diff options
Diffstat (limited to 'digikam/imageplugins/coreplugin/sharpnesseditor')
7 files changed, 32 insertions, 32 deletions
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c index ddd35d9..f8802ee 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/endfile.c @@ -38,9 +38,9 @@ integer f_end(alist *a) static int #ifdef KR_headers -copy(from, len, to) FILE *from, *to; register long len; +copy(from, len, to) FILE *from, *to; long len; #else -copy(FILE *from, register long len, FILE *to) +copy(FILE *from, long len, FILE *to) #endif { int len1; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c index 91483fc..0c25dee 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/fmtlib.c @@ -11,13 +11,13 @@ #ifdef KR_headers char *f__icvt(value,ndigit,sign, base) longint value; int *ndigit,*sign; - register int base; + int base; #else char *f__icvt(longint value, int *ndigit, int *sign, int base) #endif { static char buf[MAXINTLENGTH+1]; - register int i; + int i; ulongint uvalue; if(value > 0) { diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c index 1e052f2..c6fd9c0 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_cmp.c @@ -8,7 +8,7 @@ integer s_cmp(a0, b0, la, lb) char *a0, *b0; ftnlen la, lb; integer s_cmp(char *a0, char *b0, ftnlen la, ftnlen lb) #endif { -register unsigned char *a, *aend, *b, *bend; +unsigned char *a, *aend, *b, *bend; a = (unsigned char *)a0; b = (unsigned char *)b0; aend = a + la; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c index d167351..9287d7f 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/s_copy.c @@ -9,12 +9,12 @@ /* assign strings: a = b */ #ifdef KR_headers -VOID s_copy(a, b, la, lb) register char *a, *b; ftnlen la, lb; +VOID s_copy(a, b, la, lb) char *a, *b; ftnlen la, lb; #else -void s_copy(register char *a, register char *b, ftnlen la, ftnlen lb) +void s_copy(char *a, char *b, ftnlen la, ftnlen lb) #endif { - register char *aend, *bend; + char *aend, *bend; aend = a + la; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c index dba1521..d17bc6b 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/sig_die.c @@ -8,7 +8,7 @@ #endif #ifdef KR_headers -void sig_die(s, kill) register char *s; int kill; +void sig_die(s, kill) char *s; int kill; #else #include "stdlib.h" #ifdef __cplusplus @@ -16,7 +16,7 @@ extern "C" { #endif extern void f_exit(void); -void sig_die(register char *s, int kill) +void sig_die(char *s, int kill) #endif { /* print error message, then clear buffers */ diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c index 477c40f..92ce295 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/wrtfmt.c @@ -71,8 +71,8 @@ wrt_Z(n,w,minlen,len) Uint *n; int w, minlen; ftnlen len; wrt_Z(Uint *n, int w, int minlen, ftnlen len) #endif { - register char *s, *se; - register int i, w1; + char *s, *se; + int i, w1; static int one = 1; static char hex[] = "0123456789ABCDEF"; s = (char *)n; @@ -121,9 +121,9 @@ wrt_Z(Uint *n, int w, int minlen, ftnlen len) static int #ifdef KR_headers -wrt_I(n,w,len, base) Uint *n; ftnlen len; register int base; +wrt_I(n,w,len, base) Uint *n; ftnlen len; int base; #else -wrt_I(Uint *n, int w, ftnlen len, register int base) +wrt_I(Uint *n, int w, ftnlen len, int base) #endif { int ndigit,sign,spare,i; longint x; diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp index 10a12b7..cfb8afe 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp @@ -128,7 +128,7 @@ inline double RefocusMatrix::c_mat_elt (const CMat * const mat, const int col, c void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const CMat * const matb) { - register int xr, yr, xa, ya; + int xr, yr, xa, ya; for (yr = -result->radius; yr <= result->radius; yr++) { @@ -138,7 +138,7 @@ void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const const int ya_high = TQMIN (mata->radius, yr + matb->radius); const int xa_low = TQMAX (-mata->radius, xr - matb->radius); const int xa_high = TQMIN (mata->radius, xr + matb->radius); - register double val = 0.0; + double val = 0.0; for (ya = ya_low; ya <= ya_high; ya++) { @@ -156,7 +156,7 @@ void RefocusMatrix::convolve_mat (CMat * result, const CMat * const mata, const void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, const CMat * const matb) { - register int xr, yr, xa, ya; + int xr, yr, xa, ya; for (yr = -result->radius; yr <= result->radius; yr++) { @@ -166,7 +166,7 @@ void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, c const int ya_high = TQMIN (mata->radius, matb->radius - yr); const int xa_low = TQMAX (-mata->radius, -matb->radius - xr); const int xa_high = TQMIN (mata->radius, matb->radius - xr); - register double val = 0.0; + double val = 0.0; for (ya = ya_low; ya <= ya_high; ya++) { @@ -184,13 +184,13 @@ void RefocusMatrix::convolve_star_mat (CMat * result, const CMat * const mata, c void RefocusMatrix::convolve_mat_fun (CMat * result, const CMat * const mata, double (f) (int, int)) { - register int xr, yr, xa, ya; + int xr, yr, xa, ya; for (yr = -result->radius; yr <= result->radius; yr++) { for (xr = -result->radius; xr <= result->radius; xr++) { - register double val = 0.0; + double val = 0.0; for (ya = -mata->radius; ya <= mata->radius; ya++) { @@ -219,7 +219,7 @@ int RefocusMatrix::as_cidx (const int k, const int l) void RefocusMatrix::print_c_mat (const CMat * const mat) { - register int x, y; + int x, y; for (y = -mat->radius; y <= mat->radius; y++) { @@ -255,7 +255,7 @@ Mat *RefocusMatrix::make_s_matrix (CMat * mat, int m, double noise_factor) { const int mat_size = SQR (2 * m + 1); Mat *result = allocate_matrix (mat_size, mat_size); - register int yr, yc, xr, xc; + int yr, yc, xr, xc; for (yr = -m; yr <= m; yr++) { @@ -285,7 +285,7 @@ Mat *RefocusMatrix::make_s_cmatrix (CMat * mat, int m, double noise_factor) { const int mat_size = as_cidx (m + 1, 0); Mat *result = allocate_matrix (mat_size, mat_size); - register int yr, yc, xr, xc; + int yr, yc, xr, xc; for (yr = 0; yr <= m; yr++) { @@ -318,7 +318,7 @@ double RefocusMatrix::correlation (const int x, const int y, const double gamma, Mat *RefocusMatrix::copy_vec (const CMat * const mat, const int m) { Mat *result = allocate_matrix (SQR (2 * m + 1), 1); - register int x, y, index = 0; + int x, y, index = 0; for (y = -m; y <= m; y++) { @@ -336,7 +336,7 @@ Mat *RefocusMatrix::copy_vec (const CMat * const mat, const int m) Mat *RefocusMatrix::copy_cvec (const CMat * const mat, const int m) { Mat *result = allocate_matrix (as_cidx (m + 1, 0), 1); - register int x, y, index = 0; + int x, y, index = 0; for (y = 0; y <= m; y++) { @@ -354,7 +354,7 @@ Mat *RefocusMatrix::copy_cvec (const CMat * const mat, const int m) CMat *RefocusMatrix::copy_cvec2mat (const Mat * const cvec, const int m) { CMat *result = allocate_c_mat (m); - register int x, y; + int x, y; for (y = -m; y <= m; y++) { @@ -370,7 +370,7 @@ CMat *RefocusMatrix::copy_cvec2mat (const Mat * const cvec, const int m) CMat *RefocusMatrix::copy_vec2mat (const Mat * const cvec, const int m) { CMat *result = allocate_c_mat (m); - register int x, y; + int x, y; for (y = -m; y <= m; y++) { @@ -482,7 +482,7 @@ void RefocusMatrix::fill_matrix (CMat * matrix, const int m, double f (const int, const int, const double), const double fun_arg) { - register int x, y; + int x, y; init_c_mat (matrix, m); for (y = -m; y <= m; y++) @@ -498,7 +498,7 @@ void RefocusMatrix::fill_matrix2 (CMat * matrix, const int m, double f (const int, const int, const double, const double), const double fun_arg1, const double fun_arg2) { - register int x, y; + int x, y; init_c_mat (matrix, m); for (y = -m; y <= m; y++) @@ -512,7 +512,7 @@ void RefocusMatrix::fill_matrix2 (CMat * matrix, const int m, void RefocusMatrix::make_gaussian_convolution (const double gradius, CMat * convolution, const int m) { - register int x, y; + int x, y; #ifdef RF_DEBUG DDebug() << "gauss: " << gradius << endl; @@ -589,9 +589,9 @@ double RefocusMatrix::circle_intensity (const int x, const int y, const double r } else { - register double xlo = TQABS (x) - 0.5, xhi = TQABS (x) + 0.5, + double xlo = TQABS (x) - 0.5, xhi = TQABS (x) + 0.5, ylo = TQABS (y) - 0.5, yhi = TQABS (y) + 0.5; - register double symmetry_factor = 1, xc1, xc2; + double symmetry_factor = 1, xc1, xc2; if (xlo < 0) { |