head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.52 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.50 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.48 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.46 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.44 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.42 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.40 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.38 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.36 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.34 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.32 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.30 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.28 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.26 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.24 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.22 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.20 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.18 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.16 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.14 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.12 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.10 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.8 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.6 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.4 pkgsrc-2019Q4-base:1.2 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.2 date 2019.11.16.17.36.28; author ng0; state Exp; branches; next 1.1; commitid wDq433jKdUvHe6LB; 1.1 date 2018.02.13.12.45.02; author ryoon; state Exp; branches; next ; commitid b65oUkL5jnUcjHqA; desc @@ 1.2 log @xplanet: Update to version 1.3.1 * Add 2017 leap second patch from upstream as well as fix output bug when num_times is 2 patch. * Fix build with clang Upstream Changelog from SVN: Don't outline symbol for markers where outlined=false fix marker bug when range is a small value update gif code to giflib-4.2.0 update gif code to 5.0.0 fix arc bug at close ranges, update default night image update version number use distance from limb plane instead of planet center when deciding when to draw annotations reapply marker fix fix limb distance bug Add -label_altitude option fix radius bug Fix label bug use GetTempPath() for windows add windows directory add string.h to png.c use JPL's leapsecond kernel definitions for ET-UTC add deltaT expression for pre 1838 fix UTC bug Update MS Windows desktop size update comments in config file updates for cygwin set default desktop file type to PNG add 2015 leap second release 1.3.1 @ text @$NetBSD: patch-src_libannotate_addMarkers.cpp,v 1.1 2018/02/13 12:45:02 ryoon Exp $ Multiple inFile.getline() calls within xplanet test the return against NULL in a read loop, but g++ 6 doesn't like this. Replace with checks for inFile.eof() and inFile.fail() instead. --- src/libannotate/addMarkers.cpp.orig 2011-11-15 01:44:24.000000000 +0000 +++ src/libannotate/addMarkers.cpp @@@@ -429,12 +429,16 @@@@ addMarkers(PlanetProperties *planetProperties, Planet *planet, { ifstream inFile(markerFile.c_str()); char *line = new char[MAX_LINE_LENGTH]; - while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL) + while (1) { unsigned char color[3]; memcpy(color, planetProperties->MarkerColor(), 3); string font(planetProperties->MarkerFont()); int fontSize(planetProperties->MarkerFontSize()); + + inFile.getline (line, MAX_LINE_LENGTH, '\n'); + if (inFile.eof() || inFile.fail()) + break; readMarkerFile(line, planet, pixel_radius, view, projection, width, height, @@@@ -475,13 +479,18 @@@@ addMarkers(View *view, const int width, const int height, { ifstream inFile(markerFile.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'); + unsigned char color[3]; memcpy(color, options->Color(), 3); string font(options->Font()); int fontSize(options->FontSize()); - + + if (inFile.eof() || inFile.fail()) + break; + readMarkerFile(line, NULL, 0, view, NULL, width, height, color, font, fontSize, 1.0, @ 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 @d1 5 a5 1 $NetBSD$ d9 1 a9 1 @@@@ -423,13 +423,16 @@@@ addMarkers(PlanetProperties *planetPrope d14 1 a14 1 + while (1) d20 4 d25 1 a25 4 + inFile.getline (line, MAX_LINE_LENGTH, '\n'); + if (inFile.eof() || inFile.fail()) + break; readMarkerFile(line, planet, pixel_radius, X, Y, Z, d27 1 a27 2 color, font, fontSize, @@@@ -469,13 +472,18 @@@@ addMarkers(View *view, const int width, d32 3 a34 4 - { + while (1) + { + inFile.getline (line, MAX_LINE_LENGTH, '\n'); d40 4 a43 3 + if (inFile.eof() || inFile.fail()) + break; d45 1 a45 1 readMarkerFile(line, NULL, 0, 0, 0, 0, @