File gpscorrelate-1.5.8-debian.diff of Package gpscorrelate

Overview Repositories Revisions Requests Users Attributes Meta

File gpscorrelate-1.5.8-debian.diff of Package gpscorrelate (Revision 90e670af794c01806276d89e0cdb0623)

Currently displaying revision 90e670af794c01806276d89e0cdb0623 , Show latest

diff -Naur a/exif-gps.cpp b/exif-gps.cpp
--- a/exif-gps.cpp	2008-09-21 04:09:04.000000000 +0100
+++ b/exif-gps.cpp	2009-03-04 23:02:20.000000000 +0000
@@ -219,44 +219,58 @@
 		//     -- / 3600 = result
 		//      v   
 		// Each part is added to the final number.
+		Exiv2::Rational RatNum;
+
 		GPSData = ExifRead["Exif.GPSInfo.GPSLatitude"];
-		Exiv2::Rational RatNum = GPSData.toRational(0);
-		*Lat = (double)RatNum.first / (double)RatNum.second;
-		RatNum = GPSData.toRational(1);
-		*Lat = *Lat + (((double)RatNum.first / (double)RatNum.second) / 60);
-		RatNum = GPSData.toRational(2);
-		*Lat = *Lat + (((double)RatNum.first / (double)RatNum.second) / 3600);
-		
-		GPSData = ExifRead["Exif.GPSInfo.GPSLatitudeRef"];
-		if (strcmp(GPSData.toString().c_str(), "S") == 0)
-		{
-			// Negate the value - Western Hemisphere.
-			*Lat = -*Lat;
+		if (GPSData.count() < 3)
+			*Lat = nan("invalid");
+		else {
+			RatNum = GPSData.toRational(0);
+			*Lat = (double)RatNum.first / (double)RatNum.second;
+			RatNum = GPSData.toRational(1);
+			*Lat = *Lat + (((double)RatNum.first / (double)RatNum.second) / 60);
+			RatNum = GPSData.toRational(2);
+			*Lat = *Lat + (((double)RatNum.first / (double)RatNum.second) / 3600);
+
+			GPSData = ExifRead["Exif.GPSInfo.GPSLatitudeRef"];
+			if (strcmp(GPSData.toString().c_str(), "S") == 0)
+			{
+				// Negate the value - Western Hemisphere.
+				*Lat = -*Lat;
+			}
 		}
 		
 		GPSData = ExifRead["Exif.GPSInfo.GPSLongitude"];
-		RatNum = GPSData.toRational(0);
-		*Long = (double)RatNum.first / (double)RatNum.second;
-		RatNum = GPSData.toRational(1);
-		*Long = *Long + (((double)RatNum.first / (double)RatNum.second) / 60);
-		RatNum = GPSData.toRational(2);
-		*Long = *Long + (((double)RatNum.first / (double)RatNum.second) / 3600);
-		
-		GPSData = ExifRead["Exif.GPSInfo.GPSLongitudeRef"];
-		if (strcmp(GPSData.toString().c_str(), "W") == 0)
-		{
-			// Negate the value - Western Hemisphere.
-			*Long = -*Long;
+		if (GPSData.count() < 3)
+			*Long = nan("invalid");
+		else {
+			RatNum = GPSData.toRational(0);
+			*Long = (double)RatNum.first / (double)RatNum.second;
+			RatNum = GPSData.toRational(1);
+			*Long = *Long + (((double)RatNum.first / (double)RatNum.second) / 60);
+			RatNum = GPSData.toRational(2);
+			*Long = *Long + (((double)RatNum.first / (double)RatNum.second) / 3600);
+
+			GPSData = ExifRead["Exif.GPSInfo.GPSLongitudeRef"];
+			if (strcmp(GPSData.toString().c_str(), "W") == 0)
+			{
+				// Negate the value - Western Hemisphere.
+				*Long = -*Long;
+			}
 		}
 
 		// Finally, read elevation out. This one is simple.
 		GPSData = ExifRead["Exif.GPSInfo.GPSAltitude"];
-		RatNum = GPSData.toRational(0);
-		*Elev = (double)RatNum.first / (double)RatNum.second;
+		if (GPSData.count() < 1)
+			*Elev = nan("invalid");
+		else {
+			RatNum = GPSData.toRational(0);
+			*Elev = (double)RatNum.first / (double)RatNum.second;
+		}
 
 		// Is the altitude below sea level? If so, negate the value.
 		GPSData = ExifRead["Exif.GPSInfo.GPSAltitudeRef"];
-		if (strcmp(GPSData.toString().c_str(), "1") == 0)
+		if (GPSData.count() >= 1 && GPSData.toLong() == 1)
 		{
 			// Negate the elevation.
 			*Elev = -*Elev;
@@ -328,16 +342,28 @@
 	} else {
 		// Seems to include GPS data...
 		*IncludesGPS = 1;
-		
+
+		Exiv2::Rational RatNum1;
+		Exiv2::Rational RatNum2;
+		Exiv2::Rational RatNum3;
+
 		// Read out the Time and Date stamp, for correction.
 		GPSData = ExifRead["Exif.GPSInfo.GPSTimeStamp"];
-		Exiv2::Rational RatNum1 = GPSData.toRational(0);
-		Exiv2::Rational RatNum2 = GPSData.toRational(1);
-		Exiv2::Rational RatNum3 = GPSData.toRational(2);
+		if (GPSData.count() < 3) {
+			*IncludesGPS = 0;
+			return Copy;
+		}
+		RatNum1 = GPSData.toRational(0);
+		RatNum2 = GPSData.toRational(1);
+		RatNum3 = GPSData.toRational(2);
 		snprintf(TimeStamp, 12, "%02d:%02d:%02d",
 				RatNum1.first, RatNum2.first, RatNum3.first);
 		
 		GPSData = ExifRead["Exif.GPSInfo.GPSDateStamp"];
+		if (GPSData.count() < 3) {
+			*IncludesGPS = 0;
+			return Copy;
+		}
 		RatNum1 = GPSData.toRational(0);
 		RatNum2 = GPSData.toRational(1);
 		RatNum3 = GPSData.toRational(2);
@@ -469,7 +495,7 @@
 	ExifToWrite.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"), Value.get());
 	// And the actual altitude.
 	Value = Exiv2::Value::create(Exiv2::unsignedRational);
-	ConvertToRational(Point->Elev, &Nom, &Denom, 4);
+	ConvertToRational(fabs(Point->Elev), &Nom, &Denom, 4);
 	snprintf(ScratchBuf, 100, "%ld/%ld", Nom, Denom);
 
 	/* printf("Altitude: %f -> %s\n", Point->Elev, ScratchBuf); */
diff -Naur a/gpx-read.c b/gpx-read.c
--- a/gpx-read.c	2008-10-31 11:50:39.000000000 +0000
+++ b/gpx-read.c	2009-03-04 23:02:20.000000000 +0000
@@ -92,11 +92,13 @@
 			{
 				if (strcmp((char *)CCurrent->name, "ele") == 0)
 				{
-					Elev = (char *)CCurrent->children->content;
+					if (CCurrent->children)
+						Elev = (char *)CCurrent->children->content;
 				}
 				if (strcmp((char *)CCurrent->name, "time") == 0)
 				{
-					Time = (char *)CCurrent->children->content;
+					if (CCurrent->children)
+						Time = (char *)CCurrent->children->content;
 				}
 			}
 
diff -Naur a/Makefile b/Makefile
--- a/Makefile	2009-03-13 20:16:15.000000000 +0000
+++ b/Makefile	2009-03-13 20:16:08.000000000 +0000
@@ -5,9 +5,11 @@
 COBJS    = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
 GOBJS    = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
 CFLAGS   = -Wall
-override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
+CFLAGS  += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
 OFLAGS   = -Wall
-override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
+OFLAGS  += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
+OFLAGS_CON = $(OFLAGS) -Wl,--as-needed $(shell pkg-config --libs libxml-2.0) -lm -lexiv2
+OFLAGS_GTK = $(OFLAGS) -Wl,--as-needed $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
 prefix   = /usr/local
 bindir   = $(prefix)/bin
 mandir   = $(prefix)/share/man
@@ -17,10 +19,10 @@
 all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
 
 gpscorrelate: $(COBJS)
-	gcc $(OFLAGS) -o $@ $(COBJS)
+	gcc -o $@ $(COBJS) $(OFLAGS_CON)
 
 gpscorrelate-gui: $(GOBJS)
-	gcc $(OFLAGS) -o $@ $(GOBJS)
+	gcc -o $@ $(GOBJS) $(OFLAGS_GTK)
 
 .c.o:
 	gcc $(CFLAGS) -c -o $*.o $<
@@ -29,7 +31,7 @@
 	g++ $(CFLAGS) -c -o $*.o $<
 
 clean:
-	rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
+	rm -f *.o gpscorrelate gpscorrelate-gui doc/gpscorrelate-manpage.xml gpscorrelate.1
 
 install: all
 	install -d $(DESTDIR)$(bindir)
@@ -46,4 +48,4 @@
 	sed  's,@DOCDIR@,$(docdir),' $< > $@
 
 gpscorrelate.1: doc/gpscorrelate-manpage.xml
-	xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	xsltproc --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

Places

File gpscorrelate-1.5.8-debian.diff of Package gpscorrelate (Revision 90e670af794c01806276d89e0cdb0623)

Places