From 3d907fd76ca23d69bcd7d25367c9c94063490d38 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 13 Mar 2007 18:29:45 +0100 Subject: add devignetting infrastructure --- src/Stitch.H | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index dcfc691..13e7bc0 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -33,6 +33,9 @@ class Stitch { int resample(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); + + int vignette_calib(GipfelWidget::sample_mode_t m, + int w, int h, double view_start, double view_end); }; #endif -- cgit v1.2.3 From 905cd5600e604aa1f9fe256ab3b4d7125695951e Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Thu, 15 Mar 2007 00:25:29 +0100 Subject: add color and brightness adjustment --- src/Stitch.H | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 13e7bc0..62175be 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -13,13 +13,15 @@ #define MAX_PICS 256 + class Stitch { private: GipfelWidget *gipf[MAX_PICS]; + double color_adjust[MAX_PICS][3]; + double V1, V2; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; - public: Stitch(); @@ -34,6 +36,9 @@ class Stitch { int resample(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); + int color_calib(GipfelWidget::sample_mode_t m, + int w, int h, double view_start, double view_end); + int vignette_calib(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); }; -- cgit v1.2.3 From 5fd1230803fddcfb8e3cfb38608221ef52c0f104 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 16 Mar 2007 15:20:43 +0100 Subject: try linear version - does not work yet --- src/Stitch.H | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 62175be..29f0ef3 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -17,11 +17,13 @@ class Stitch { private: GipfelWidget *gipf[MAX_PICS]; - double color_adjust[MAX_PICS][3]; - double V1, V2; + int num_pics; + double color_adjust[MAX_PICS][3][3]; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; + uchar color_correct(uchar c, double a, int pic, int color); + public: Stitch(); @@ -36,9 +38,6 @@ class Stitch { int resample(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); - int color_calib(GipfelWidget::sample_mode_t m, - int w, int h, double view_start, double view_end); - int vignette_calib(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); }; -- cgit v1.2.3 From 8cba58d9aa6b4f92fe90231966f58ad0435f1d3f Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 16 Mar 2007 17:13:56 +0100 Subject: try other model --- src/Stitch.H | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 29f0ef3..9fe3c15 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -18,7 +18,8 @@ class Stitch { private: GipfelWidget *gipf[MAX_PICS]; int num_pics; - double color_adjust[MAX_PICS][3][3]; + double color_adjust[MAX_PICS][3]; + double V1, V2; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; -- cgit v1.2.3 From d09316016e4e0b782d784785641fec91de7d58a6 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 16 Mar 2007 18:35:35 +0100 Subject: switch to 16 bit color depth internally --- src/Stitch.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 9fe3c15..b5fb6fd 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -23,7 +23,7 @@ class Stitch { OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; - uchar color_correct(uchar c, double a, int pic, int color); + int color_correct(int c, double a, int pic, int color); public: Stitch(); -- cgit v1.2.3 From ad1abce7a41bdb5f6d2005ac63f6e8b5599ec244 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sun, 18 Mar 2007 12:21:29 +0100 Subject: remove color adjust stuff --- src/Stitch.H | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Stitch.H') 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; -- cgit v1.2.3 From 5457c660336a7f9bc74bdf85ab4e001a4f81a6f9 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 19 Mar 2007 18:04:49 +0100 Subject: further refactoring --- src/Stitch.H | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 7a47cf6..b2913aa 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -19,11 +19,17 @@ class Stitch { GipfelWidget *gipf[MAX_PICS]; int num_pics; double V1, V2; + double color_adjust[MAX_PICS][3]; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; + double vignetting_parameter(int pic, double a_view, double a_nick); + int color_correct(int c, double a, int pic, int color); + int get_pixel(GipfelWidget::sample_mode_t m, int pic, + double a_view, double a_nick, int *r, int *g, int *b); + public: Stitch(); -- cgit v1.2.3 From eb4b8da95067a71e727571a5da2bede913690dd0 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 19 Mar 2007 18:52:45 +0100 Subject: implement color correction --- src/Stitch.H | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index b2913aa..cd8d7d4 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -46,6 +46,9 @@ class Stitch { int vignette_calib(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); + + int color_calib(GipfelWidget::sample_mode_t m, + int w, int h, double view_start, double view_end); }; #endif -- cgit v1.2.3 From 429ccd9cd43376eab85f84d30427d0d4fb3fa405 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 20 Mar 2007 23:26:23 +0100 Subject: use single variable vignetting correction model --- src/Stitch.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index cd8d7d4..636991c 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -18,7 +18,7 @@ class Stitch { private: GipfelWidget *gipf[MAX_PICS]; int num_pics; - double V1, V2; + double V[4]; double color_adjust[MAX_PICS][3]; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; -- cgit v1.2.3 From 5b4a674c5922c6516ce6fe580800bacb5bf18b91 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 9 May 2007 18:49:32 +0200 Subject: remove color- and vignetting correction code --- src/Stitch.H | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/Stitch.H') diff --git a/src/Stitch.H b/src/Stitch.H index 636991c..0632192 100644 --- a/src/Stitch.H +++ b/src/Stitch.H @@ -18,18 +18,9 @@ class Stitch { private: GipfelWidget *gipf[MAX_PICS]; int num_pics; - double V[4]; - double color_adjust[MAX_PICS][3]; OutputImage *single_images[MAX_PICS]; OutputImage *merged_image; - double vignetting_parameter(int pic, double a_view, double a_nick); - - int color_correct(int c, double a, int pic, int color); - - int get_pixel(GipfelWidget::sample_mode_t m, int pic, - double a_view, double a_nick, int *r, int *g, int *b); - public: Stitch(); @@ -43,12 +34,6 @@ class Stitch { int resample(GipfelWidget::sample_mode_t m, int w, int h, double view_start, double view_end); - - int vignette_calib(GipfelWidget::sample_mode_t m, - int w, int h, double view_start, double view_end); - - int color_calib(GipfelWidget::sample_mode_t m, - int w, int h, double view_start, double view_end); }; #endif -- cgit v1.2.3