From 4b2dc2ab9526ccca3cc6a0a7d85e9236b7ed3582 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Mon, 18 Dec 2006 22:11:00 +0100
Subject: add distortion profile handling

---
 src/ImageMetaData.cxx | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/ImageMetaData.cxx')

diff --git a/src/ImageMetaData.cxx b/src/ImageMetaData.cxx
index 0e2c03b..95b6e86 100644
--- a/src/ImageMetaData.cxx
+++ b/src/ImageMetaData.cxx
@@ -18,8 +18,18 @@
 #include "ImageMetaData.H"
 
 ImageMetaData::ImageMetaData() {
+	clear();
+}
+
+ImageMetaData::~ImageMetaData() {
+	if (manufacturer) free(manufacturer);
+	if (model) free(model);
+}
+
+void
+ImageMetaData::clear() {
 	manufacturer = NULL;
-	model = NULL;
+    model = NULL;
 	longitude = NAN;
 	latitude = NAN;
 	height = NAN;
@@ -34,15 +44,14 @@ ImageMetaData::ImageMetaData() {
 	projection_type = 0;
 }
 
-ImageMetaData::~ImageMetaData() {
-	if (manufacturer) free(manufacturer);
-	if (model) free(model);
-}
-
 int
 ImageMetaData::load_image(char *name, int img_width) {
 	int ret;
 
+	if (manufacturer) free(manufacturer);
+	if (model) free(model);
+	clear();
+
 	ret = load_image_jpgcom(name);
 	if (ret == 2) { // old format
 		focal_length_35mm = scale * 35.0 / (double) img_width;
@@ -53,8 +62,6 @@ ImageMetaData::load_image(char *name, int img_width) {
 	if (isnan(direction)) direction = 0.0;
 	if (isnan(nick)) nick = 0.0;
 	if (isnan(tilt)) tilt = 0.0;
-	if (isnan(k0)) k0 = 0.0;
-	if (isnan(k1)) k1 = 0.0;
 
 	return ret;
 }
-- 
cgit v1.2.3