From 8633dd74aa6907dd6bf864170bb601f9af6d5eae Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Wed, 30 Jan 2008 20:31:12 +0100
Subject: -Wall fixes

---
 src/GipfelWidget.cxx    | 2 --
 src/JPEGOutputImage.cxx | 1 +
 src/Panorama.cxx        | 3 +--
 src/ProjectionLSQ.H     | 1 +
 src/ProjectionLSQ.cxx   | 2 +-
 src/Stitch.cxx          | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/GipfelWidget.cxx b/src/GipfelWidget.cxx
index 7586a7f..63e89d2 100644
--- a/src/GipfelWidget.cxx
+++ b/src/GipfelWidget.cxx
@@ -719,7 +719,6 @@ GipfelWidget::export_hills(const char *file, FILE *fp) {
 	mnts = pan->get_visible_mountains();
 	for (int i=0; i<mnts->get_num(); i++) {
 		Hill *m = mnts->get(i);
-		char *flags;
 		int _x = (int) rint(m->x) + w() / 2;
 		int _y = (int) rint(m->y) + h() / 2;
 
@@ -746,7 +745,6 @@ int
 GipfelWidget::get_pixel(GipfelWidget::sample_mode_t m,
 	double a_alph, double a_nick, int *r, int *g, int *b) {
 	double px, py;
-	int r_tmp, g_tmp, b_tmp;
 	int ret;
 
 	if (img == NULL) {
diff --git a/src/JPEGOutputImage.cxx b/src/JPEGOutputImage.cxx
index 0a5eb00..0f3cf18 100644
--- a/src/JPEGOutputImage.cxx
+++ b/src/JPEGOutputImage.cxx
@@ -65,6 +65,7 @@ JPEGOutputImage::init_internal(int w1, int h1) {
 
 	jpeg_start_compress(&cinfo, TRUE);
 
+	return 0;
 }
 
 int
diff --git a/src/Panorama.cxx b/src/Panorama.cxx
index 0b99282..32e14f4 100644
--- a/src/Panorama.cxx
+++ b/src/Panorama.cxx
@@ -431,8 +431,7 @@ Panorama::alpha(const Hill *m) {
 
 double
 Panorama::nick(const Hill *m) {
-	double a, b, c;
-	double beta;
+	double b, c;
 
 	b = m->height + get_earth_radius(m->phi);
 	c = view_height + get_earth_radius(view_phi);
diff --git a/src/ProjectionLSQ.H b/src/ProjectionLSQ.H
index 273585f..44cc91d 100644
--- a/src/ProjectionLSQ.H
+++ b/src/ProjectionLSQ.H
@@ -26,6 +26,7 @@ class ProjectionLSQ {
 		} Projection_t;
 
 		ProjectionLSQ();
+		virtual ~ProjectionLSQ() {};
 
 		void get_coordinates(double a_view, double a_nick,
 			const ViewParams *parms, double *x, double *y);
diff --git a/src/ProjectionLSQ.cxx b/src/ProjectionLSQ.cxx
index 901c721..cdf9f04 100644
--- a/src/ProjectionLSQ.cxx
+++ b/src/ProjectionLSQ.cxx
@@ -34,7 +34,7 @@ ProjectionLSQ::get_view_angle() {
 
 int
 ProjectionLSQ::comp_params(const Hills *h, ViewParams *parms) {
-	const Hill *tmp, *m1, *m2;
+	const Hill *m1, *m2;
 	double scale_tmp;
 	int distortion_correct = 0;
 
diff --git a/src/Stitch.cxx b/src/Stitch.cxx
index ae06cde..afd07fe 100644
--- a/src/Stitch.cxx
+++ b/src/Stitch.cxx
@@ -111,7 +111,6 @@ Stitch::resample(GipfelWidget::sample_mode_t m,
 
 	for (int y = 0; y < h; y++) {
 		double a_nick = atan((double)(y_off - y)/radius);
-		double a_max = 0.0;
 
 		for (int x = 0; x < w; x++) {
 			double a_view;
-- 
cgit v1.2.3