Skip to content

Commit a04e0ef

Browse files
committed
Changed INI file parser to no longer issue a warning on trailing whitespace.
Also removed trailing whitespace from the `float1` sample animation's INI file.
1 parent eeeb039 commit a04e0ef

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

changes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ Compatibility Improvements
156156
Miscellaneous Improvements
157157
--------------------------
158158

159+
- Trailing whitespace in INI files no longer causes a warning.
159160
- Animation status messages now include the nominal frame number.
160161
- POV-Ray for Windows now reports file names and line numbers of warnings.
161162
- Colour maps, pigment maps and the like are no longer limited to 256 entries.

distribution/scenes/animations/float1/float1.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Antialias=On
55
Antialias_Threshold=0.2
66
Antialias_Depth=3
77

8-
Test_Abort_Count=50
8+
Test_Abort_Count=50
99

1010
Input_File_Name=float1.pov
1111

source/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define OFFICIAL_VERSION_STRING "3.7.1"
4646
#define OFFICIAL_VERSION_NUMBER 371
4747

48-
#define POV_RAY_PRERELEASE "alpha.8586521"
48+
#define POV_RAY_PRERELEASE "alpha.8586719"
4949

5050
#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
5151
#ifdef POV_RAY_PRERELEASE

source/frontend/processoptions.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/// @parblock
99
///
1010
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
11-
/// Copyright 1991-2015 Persistence of Vision Raytracer Pty. Ltd.
11+
/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
1212
///
1313
/// POV-Ray is free software: you can redistribute it and/or modify
1414
/// it under the terms of the GNU Affero General Public License as
@@ -1178,6 +1178,10 @@ bool ProcessOptions::Parse_INI_String_Smartmode(ITextStream *file)
11781178
// end of file
11791179
case EOF:
11801180
break; // return false, parsing more of the string simply is not possible
1181+
// end of line
1182+
case '\r':
1183+
case '\n':
1184+
break; // return false, this was just a case of trailing whitespace
11811185
// INI file comment
11821186
case ';':
11831187
case '#':

unix/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.1-alpha.8586521
1+
3.7.1-alpha.8586719

0 commit comments

Comments
 (0)