1 files changed, 19 insertions, 107 deletions

diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index 91a9dc5..7e9f6fc 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -22,6 +22,7 @@
 
 #include "Fl_Search_Chooser.H"
 #include "choose_hill.H"
+#include "ScanImage.H"
 #include "GipfelWidget.H"
 
 #define CROSS_SIZE 2
@@ -245,6 +246,9 @@ GipfelWidget::draw() {
 			known_hills->contains(m) || m == focused_mountain)
 			continue;
 
+		if (fabs(m->x) > img->w() / 2 || fabs(m->y) > img->h() / 2)
+			continue;
+
 		fl_xyline(m_x - CROSS_SIZE, m_y, m_x + CROSS_SIZE);
 		fl_yxline(m_x, m_y + m->label_y - height, m_y + CROSS_SIZE);
 		fl_xyline(m_x, m_y + m->label_y - height, m_x + m->label_x);
@@ -259,6 +263,9 @@ GipfelWidget::draw() {
 			(!show_hidden && (m->flags & Hill::HIDDEN)) || m == focused_mountain)
 			continue;
 
+		if (fabs(m->x) > img->w() / 2 || fabs(m->y) > img->h() / 2)
+			continue;
+
 		if (known_hills->contains(m)) {
 			if (known_hills->get_num() > 3)
 				fl_color(FL_GREEN);
@@ -298,16 +305,16 @@ GipfelWidget::draw() {
 			m = track_points->get(i);
 			int m_x = w() / 2 + x() + (int) rint(m->x);
 			int m_y = h() / 2 + y() + (int) rint(m->y);
-			if (!(track_points->get(i)->flags & Hill::VISIBLE)) {
+
+			if (!(track_points->get(i)->flags & Hill::VISIBLE))
 				continue;
-			}
 
 			if (track_points->get(i)->flags & Hill::HIDDEN)
 				fl_color(FL_BLUE);
 			else
 				fl_color(FL_RED);
 
-			fl_line_style(FL_SOLID|FL_CAP_ROUND|FL_JOIN_ROUND,
+			fl_line_style(FL_SOLID | FL_CAP_ROUND | FL_JOIN_ROUND,
 				get_rel_track_width(track_points->get(i)));
 			if (last_initialized) {
 				fl_begin_line();
@@ -348,6 +355,9 @@ GipfelWidget::set_labels(Hills *v) {
 		if (!show_hidden && (m->flags & Hill::HIDDEN))
 			continue;
 
+		if (fabs(m->x) > img->w() / 2 || fabs(m->y) > img->h() / 2)
+			continue;
+
 		m->label_x = (int) fl_width(m->name) + 1;
 		m->label_y = 0;
 
@@ -360,6 +370,9 @@ GipfelWidget::set_labels(Hills *v) {
 			if (!show_hidden && (n->flags & Hill::HIDDEN))
 				continue;
 
+			if (fabs(m->x) > img->w() / 2 || fabs(m->y) > img->h() / 2)
+				continue;
+
 			if (overlap(m->x, m->label_x, n->x - CROSS_SIZE, n->label_x))
 				colliding.add(n);
 			else
@@ -707,7 +720,7 @@ GipfelWidget::export_hills(const char *file, FILE *fp) {
 }
 
 int
-GipfelWidget::get_pixel(GipfelWidget::sample_mode_t m,
+GipfelWidget::get_pixel(ScanImage::mode_t m,
 	double a_alph, double a_nick, int *r, int *g, int *b) {
 	double px, py;
 	int ret;
@@ -718,114 +731,13 @@ GipfelWidget::get_pixel(GipfelWidget::sample_mode_t m,
 	if (pan->get_coordinates(a_alph, a_nick, &px, &py) != 0)
 		return 1;
 
-	if (m == GipfelWidget::BICUBIC)
-		ret = get_pixel_bicubic(img, px + ((double) img->w()) / 2.0,
-			py + ((double) img->h()) / 2.0, r, g, b);
-	else 
-		ret = get_pixel_nearest(img, px + ((double) img->w()) / 2.0,
-			py + ((double) img->h()) / 2.0, r, g, b);
+	ret = ScanImage::get_pixel(img, m, px + ((double) img->w()) / 2.0,
+		py + ((double) img->h()) / 2.0, r, g, b);
 
 	return ret;
 }
 
 int
-GipfelWidget::get_pixel_nearest(Fl_Image *img, double x, double y,
-	int *r, int *g, int *b) {
-
-	if (isnan(x) || isnan(y))
-		return 1;
-	else
-		return get_pixel(img, (int) rint(x), (int) rint(y), r, g, b);
-}
-
-static inline double
-interp_cubic(double x, double x2, double x3, double *v) {
-	double a0, a1, a2, a3;
-
-	a0 = v[3] - v[2] - v[0] + v[1];
-	a1 = v[0] - v[1] - a0;
-	a2 = v[2] - v[0];
-	a3 = v[1];
-
-	return a0 * x3 + a1 * x2 + a2 * x + a3;
-}
-
-int
-GipfelWidget::get_pixel_bicubic(Fl_Image *img, double x, double y,
-	int *r, int *g, int *b) {
-
-	double fl_x = floor(x);
-	double fl_y = floor(y);
-	double dx = x - fl_x, dx2 = dx * dx, dx3 = dx2 * dx;
-	double dy = y - fl_y, dy2 = dy * dy, dy3 = dy2 * dy;
-	int ic[3];
-	double c[3][4];
-	double c1[3][4];
-
-	for (int iy = 0; iy < 4; iy++) {
-		for (int ix = 0; ix < 4; ix++) {
-
-			if (get_pixel(img, (int) fl_x + ix - 1, (int) fl_y + iy - 1,
-					&ic[0], &ic[1], &ic[2]) != 0)
-				return 1;
-
-			for (int l = 0; l < 3; l++)
-				c[l][ix] = (double) ic[l];
-		}
-
-		for (int l = 0; l < 3; l++)
-			c1[l][iy] = interp_cubic(dx, dx2, dx3, c[l]);
-	}
-
-	*r = (int) rint(interp_cubic(dy, dy2, dy3, c1[0]));
-	*g = (int) rint(interp_cubic(dy, dy2, dy3, c1[1]));
-	*b = (int) rint(interp_cubic(dy, dy2, dy3, c1[2]));
-	return 0;
-}
-
-int
-GipfelWidget::get_pixel(Fl_Image *img, int x, int y,
-                     int *r, int *g, int *b) {
-	if ( img->d() == 0 )
-		return 1;
-
-	if (x < 0 || x >=img->w() || y < 0 || y >= img->h())
-		return 1;
-
-	long index = (y * img->w() * img->d()) + (x * img->d()); // X/Y -> buf index  
-	switch (img->count()) {
-		case 1:
-		{                                            // bitmap
-			const unsigned char *buf = (const unsigned char*) img->data()[0];
-			switch (img->d())
-			{
-				case 1:
-					*r = *g = *b = *(buf+index);
-					break;
-				case 3:                              // 24bit
-					*r = (int) *(buf+index+0);
-					*g = (int) *(buf+index+1);
-					*b = (int) *(buf+index+2);
-					break;
-				default:                             // ??
-					printf("Not supported: chans=%d\n", img->d());
-					return 1;
-			}
-			break;
-		}
-		default:                                             // ?? pixmap, bit vals
-		printf("Not supported: count=%d\n", img->count());
-		return 1;
-	}
-
-	*r = *r * 255;
-	*g = *g * 255;
-	*b = *b * 255;
-
-	return 0;
-}
-
-int
 GipfelWidget::get_distortion_profile_name(char *buf, int buflen) {
 	int n;