head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.66
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.64
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.62
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.60
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.58
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.56
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.54
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.52
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.50
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.48
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.46
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.44
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.42
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.40
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.38
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.36
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.34
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.32
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.30
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.28
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.26
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.24
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.22
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.20
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.16
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.18
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.14
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.12
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.10
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.8
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.6
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.4
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.2
	pkgsrc-2018Q1-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2018.02.13.12.45.02;	author ryoon;	state Exp;
branches;
next	;
commitid	b65oUkL5jnUcjHqA;


desc
@@


1.1
log
@Update to 1.3.0

* Fix build with GCC 6 with patches from Debian

Changelog:
Version 1.3.0 (released 18 Feb 2012)
        * add "outlined" keyword to marker files

        * update JPL ephemeris code for 64 bit machines

        * add bump_shade config file parameter

        * add opacity keyword for markers

        * implement Rayleigh scattering
@
text
@$NetBSD$

--- src/libannotate/addSatellites.cpp.orig	2010-07-30 21:49:06.000000000 +0000
+++ src/libannotate/addSatellites.cpp
@@@@ -488,11 +488,23 @@@@ loadSatelliteVector(PlanetProperties *pl
         {
             ifstream inFile(tleFile.c_str());
             char lines[3][80];
-            while (inFile.getline(lines[0], 80) != NULL)
-            {
-                if ((inFile.getline(lines[1], 80) == NULL) 
-                    || (inFile.getline(lines[2], 80) == NULL))
-                {
+	    bool malformed_file = false;
+	    while (1)
+	    {
+                inFile.getline(lines[0], 80);
+ 		if (inFile.eof() || inFile.fail())
+		    break;
+		inFile.getline(lines[1], 80);
+ 		if (inFile.eof() || inFile.fail())
+		    malformed_file = true;
+		else
+		{
+                    inFile.getline(lines[2], 80);
+		    if (inFile.eof() || inFile.fail())
+		        malformed_file = true;
+                }
+		if (malformed_file)
+		{
                     ostringstream errStr;
                     errStr << "Malformed TLE file (" << tleFile << ")?\n";
                     xpWarn(errStr.str(), __FILE__, __LINE__);
@@@@ -542,10 +554,14 @@@@ addSatellites(PlanetProperties *planetPr
         {
             ifstream inFile(satFile.c_str());
             char *line = new char[MAX_LINE_LENGTH];
-            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
+	    while (1)
+	    {
+		inFile.getline (line, MAX_LINE_LENGTH, '\n');
+ 		if (inFile.eof() || inFile.fail())
+		    break;
                 readSatelliteFile(line, planet, view, projection,
                                   planetProperties, annotationMap);
-            
+            }
             inFile.close();
             delete [] line;
         }
@