summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2007-03-18 12:21:29 +0100
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2007-03-18 12:21:29 +0100
commitad1abce7a41bdb5f6d2005ac63f6e8b5599ec244 (patch)
treebfbe96a73b9912b6075518ef9d36d65180cb1d5d /src
parente7eae5d58bff3d3339ce7ffcec59570590830fb9 (diff)
remove color adjust stuff
Diffstat (limited to 'src')
-rw-r--r--src/Stitch.H1
-rw-r--r--src/Stitch.cxx11
2 files changed, 1 insertions, 11 deletions
diff --git a/src/Stitch.H b/src/Stitch.H
index b5fb6fd..7a47cf6 100644
--- a/src/Stitch.H
+++ b/src/Stitch.H
@@ -18,7 +18,6 @@ class Stitch {
private:
GipfelWidget *gipf[MAX_PICS];
int num_pics;
- double color_adjust[MAX_PICS][3];
double V1, V2;
OutputImage *single_images[MAX_PICS];
OutputImage *merged_image;
diff --git a/src/Stitch.cxx b/src/Stitch.cxx
index 69d72be..c0a770b 100644
--- a/src/Stitch.cxx
+++ b/src/Stitch.cxx
@@ -220,15 +220,6 @@ Stitch::vignette_calib(GipfelWidget::sample_mode_t m,
ret = gsl_multifit_wlinear (X, wv, yv, c, cov, &chisq, work);
gsl_multifit_linear_free (work);
- fprintf(stderr, "gsl_multifit_linear returned %d\n", ret);
-
- for (int p1=0; p1 < num_pics; p1++) {
- for (int l = 0; l<3; l++) {
- color_adjust[p1][l] = 1.0;
- }
-fprintf(stderr, "==> color_adjust(%d) %f %f %f\n", p1, color_adjust[p1][0], color_adjust[p1][1],color_adjust[p1][2]);
- }
-
V1 = gsl_vector_get(c, 0);
V2 = gsl_vector_get(c, 1);
fprintf(stderr, "==> V1 %f V2 %f\n", V1, V2);
@@ -240,7 +231,7 @@ int
Stitch::color_correct(int c, double a, int pic, int color) {
double cd = (double) c;
- cd = cd * (color_adjust[pic][color] +
+ cd = cd * (1.0 +
V1 * a * a +
V2 * a * a * a * a);