Merge branch 'master' into refactor/tokenizer

Author: c-lipka

changes.txt

@@ -56,13 +56,21 @@ Changed Behaviour
     by directives (stuff that begins with `#`).
   - UV mapping of cylinder, cone and lemon primitives has been disabled again
     for now, due to their orientation being poorly defined.
+  - An age-old bug in the inbuilt `f_enneper` isosurface function has been
+    fixed; the function now results in the originally intended shape.
 
 New Features
 ------------
 
   - The `ovus` primitive has been extended in multiple ways. See the
     documentation (currently being maintained on <http://wiki.povray.org>) for
     details.
+  - Anti-aliasing now supports a new mode 3, which can actually serve as a
+    generic oversampling mechanism not only suited to perform edge
+    anti-aliasing, but also to successtully suppress moire patterns as well as
+    reduce image noise from stochastic mechanisms (e.g. jittered area lights,
+    subsurface light transport or micronormals). The mathematical background
+    and parameterization is similar to that of adaptive focal blur.
 
 Performance Improvements
 ------------------------
@@ -99,6 +107,15 @@ Reported via the Newsgroups:
     Trying to `#declare Foo[A][B]=...` with `Foo` being an array of arrays and
     `Foo[A]` not yet initialized causes a hard crash instead of a parse error.
 
+Reported by Coverity static code analysis:
+  
+  - CID 986462,986463 (Wrapper object use after free)
+  - CID 967358-967362 (Uninitialized scalar variable)
+  - CID 1372542-1372544 (Result is not floating-point)
+  - CID 1372618 (Uninitialized scalar variable)
+  - CID 1372629 (Uninitialized pointer read)
+  - CID 1372630-1372632 (Uninitialized scalar variable)
+
 Miscellaneous:
 
   - Fix `interior_texture` for text objects (as mentioned in GitHub issue #65)

distribution/include/functions.inc

@@ -163,7 +163,12 @@
     // 2. y scale (inverse) 
     // 3. z scale (inverse)
 
-#declare f_enneper = function { internal(18) }
+#if (Functions_Inc_Temp < 3.8)
+    #declare deprecated once "f_enneper was broken prior to v3.8; results will most likely differ."
+             f_enneper = function { internal(18) }
+#else
+    #declare f_enneper = function { internal(18) }
+#end
 // Parameters: x, y, z
     // One extra parameter required: 
     // 1. Field strength

platform/unix/syspovtimer.cpp

@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -76,7 +76,7 @@ void Delay(unsigned int msec)
     timespec ts;
     ts.tv_sec = msec / 1000;
     ts.tv_nsec = (POV_ULONG) (1000000) * (msec % 1000);
-    nanosleep(&ts, NULL);
+    nanosleep(&ts, nullptr);
 #elif defined(HAVE_USLEEP)
     POV_ASSERT(msec < 1000); // On some systems, usleep() does not support sleeping for 1 second or more.
     usleep (msec * (useconds_t)1000);
@@ -126,7 +126,7 @@ static inline bool GettimeofdayMillisec(POV_ULONG& result)
 {
 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tv;  // seconds + microseconds since
-    bool success = (gettimeofday(&tv, NULL) == 0);
+    bool success = (gettimeofday(&tv, nullptr) == 0);
     if (success)
         result = static_cast<POV_ULONG>(tv.tv_sec)  *1000
                + static_cast<POV_ULONG>(tv.tv_usec) /1000;

platform/windows/syspovtimer.cpp

@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -65,7 +65,7 @@ Timer::Timer () :
     // TODO - sources on the internet indicate that GetThreadTimes() and GetProcessTimes() have been
     //        around as early as NT 3.1. Is there a reason we're only making use of it in NT 4.0 and
     //        later Windows versions?
-    mThreadHandle (NULL),
+    mThreadHandle (nullptr),
     mCPUTimeSupported (WindowsVersionDetector().IsNTVersion (4,0))
 {
     if (mCPUTimeSupported)
@@ -74,15 +74,15 @@ Timer::Timer () :
                               &mThreadHandle, 0, TRUE, DUPLICATE_SAME_ACCESS))
         {
             POV_ASSERT (false);
-            mThreadHandle = NULL;
+            mThreadHandle = nullptr;
         }
     }
     Reset ();
 }
 
 Timer::~Timer ()
 {
-    if (mThreadHandle != NULL)
+    if (mThreadHandle != nullptr)
         CloseHandle (mThreadHandle);
 }
 

platform/x86/cpuid.cpp

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -159,7 +159,7 @@ CPUVendorInfo gCPUVendorInfo[] = {
     { kCPUVendor_VM,            "VMwareVMware" },   // VMWare
     { kCPUVendor_VM,            "XenVMMXenVMM" },   // Xen HVM
     // End of list.
-    { kCPUVendor_Unrecognized,  NULL }
+    { kCPUVendor_Unrecognized,  nullptr }
 };
 
 struct CPUIDInfo
@@ -197,7 +197,7 @@ CPUIDInfo::CPUIDInfo() :
     std::memcpy(vendor + 4, &info[CPUID_EDX], 4);
     std::memcpy(vendor + 8, &info[CPUID_ECX], 4);
     vendor[12] = '\0';
-    for (CPUVendorInfo* p = gCPUVendorInfo; p->cpuidString != NULL; ++p)
+    for (CPUVendorInfo* p = gCPUVendorInfo; p->cpuidString != nullptr; ++p)
     {
         if (strcmp(vendor, p->cpuidString) == 0)
         {

platform/x86/optimizednoise.cpp

@@ -9,7 +9,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -92,8 +92,8 @@ OptimizedNoiseInfo gaOptimizedNoiseInfo[] = {
         AVXFMA4DNoise,              // dNoise,
         &kAVXFMA4NoiseEnabled,      // enabled,
         AVXFMA4Supported,           // supported,
-        NULL,                       // recommended,
-        NULL                        // init
+        nullptr,                    // recommended,
+        nullptr                     // init
     },
 #endif
 #ifdef TRY_OPTIMIZED_NOISE_AVX
@@ -116,12 +116,12 @@ OptimizedNoiseInfo gaOptimizedNoiseInfo[] = {
         AVXPortableDNoise,          // dNoise,
         &kAVXPortableNoiseEnabled,  // enabled,
         AVXSupported,               // supported,
-        NULL,                       // recommended,
-        NULL                        // init
+        nullptr,                    // recommended,
+        nullptr                     // init
     },
 #endif
     // End-of-list entry.
-    { NULL }
+    { nullptr }
 };
 
 }

revision.txt

@@ -35,6 +35,113 @@ Notes:
 POV-Ray v3.8.0-???
 ------------------------------------------------------------------------------
 
+Commit 915abb22 on 2018-09-12 by Christoph Lipka
+
+    Fix uninitialized variables in photons code discovered by static code
+    analysis (CID 1372618, CID 1372630-1372632).
+    Also placate static code analysis about a few others in user function
+    VM code (CID 967358-967362).
+
+Commit 65bd3196 on 2018-09-12 by Christoph Lipka
+
+    Fix bug in OpenEXR file handling code found by static code analysis
+    (CID 986462 and 986463).
+
+Commit 7de830ce on 2018-09-12 by Christoph Lipka
+
+    Eliminate C-style memory allocation in parametric.
+
+Commit 7fa6bb53 on 2018-09-12 by Christoph Lipka
+
+    Refactor flagging of opaque objects during parser post-processing.
+
+Commit 6fdadbde on 2018-09-12 by Christoph Lipka
+
+    [windows] Fix error in recent commit 917a8763 that broke the build.
+
+Commit 24700edb on 2018-09-12 by Christoph Lipka
+
+    Eliminate C-style memory allocation in polygon.
+
+Commit 917a8763 on 2018-09-12 by Christoph Lipka
+
+    Get rid of C-style `NULL` throughout the code in favour of the less
+    ambiguous C++11-style `nullptr`.
+
+Commit 72cf1a73 on 2018-09-12 by Christoph Lipka
+
+    Replace more magic constants in POVMS.
+
+Commit aa0b48d7 on 2018-09-12 by Christoph Lipka
+
+    Clean up use of boolean values in POVMS.
+
+Commit 49873bf9 on 2018-09-12 by Christoph Lipka
+
+    Improve code clarity with regards to POVMS return values, fixing a few
+    bugs along the way.
+
+Commit dfda62b7 on 2018-09-12 by Christoph Lipka
+
+    Minor update to stack size configuration.
+
+Commit 72862c76 on 2018-09-12 by Christoph Lipka
+
+    Minor code simplification in quadrics code.
+
+Commit 7bde9196 on 2018-09-12 by Christoph Lipka
+
+    Update various comments and a few text strings.
+
+Commit 344ed893 on 2018-09-11 by Christoph Lipka
+
+    Update to `.gitattribute`; most notably, prevent auto-merging of
+    `source/base/version.h`.
+
+Commit 8a43226e on 2018-09-11 by Christoph Lipka
+
+    Minor update to `source/base/build.h` and related docs.
+
+Commit 96489d42 on 2018-09-09 by Christoph Lipka
+
+    [unix] Make `.configure` script `COMPILED_BY` parameter optional,
+    defaulting to login name.
+
+Commit 63580949 on 2018-09-09 by Christoph Lipka
+
+    Fix bug introduced with commit 1d120c90.
+
+Commit 0984776b on 2018-09-09 by Christoph Lipka
+
+    Update git pre-commit hook. Please copy `tools/git/hooks/pre-commit`
+    to `.git/hooks/`.
+
+Commit 2843d762 on 2018-09-08 by Christoph Lipka
+
+    Fix blatant coding error in POVMS UCS2 string handling.
+
+Commit 264fa229 on 2018-09-07 by Christoph Lipka
+
+    Fix clang build error introduced with previous commit, and silence a
+    few more clang warnings.
+
+Commit 1d120c90 on 2018-09-07 by Christoph Lipka
+
+    Silence some clang warnings.
+
+Commit f09a7b4f on 2018-09-02 by Christoph Lipka
+
+    Disable new UV mappings of cylinder, cone and lemon primitives for now.
+
+Commit d20c6d42 on 2018-08-27 by Christoph Lipka
+
+    Improve `#breakpoint` debugging aid.
+    Also update changelog.
+
+------------------------------------------------------------------------------
+POV-Ray v3.8.0-alpha.9811560
+------------------------------------------------------------------------------
+
 Commit c42e14e7 on 2018-08-27 by Christoph Lipka
 
     Fix hard crash in `#declare Foo[A][B]=...` if `Foo` is an array of

source/backend/bounding/boundingtask.cpp

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -137,8 +137,8 @@ class BSPProgress : public BSPTree::Progress
         BSPProgress();
 };
 
-BoundingTask::BoundingTask(shared_ptr<BackendSceneData> sd, unsigned int bt) :
-    SceneTask(new TraceThreadData(dynamic_pointer_cast<SceneData>(sd)), boost::bind(&BoundingTask::SendFatalError, this, _1), "Bounding", sd),
+BoundingTask::BoundingTask(shared_ptr<BackendSceneData> sd, unsigned int bt, size_t seed) :
+    SceneTask(new TraceThreadData(dynamic_pointer_cast<SceneData>(sd), seed), boost::bind(&BoundingTask::SendFatalError, this, _1), "Bounding", sd),
     sceneData(sd),
     boundingThreshold(bt)
 {

source/backend/bounding/boundingtask.h

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
-/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2018 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -50,7 +50,7 @@ class TraceThreadData;
 class BoundingTask : public SceneTask
 {
     public:
-        BoundingTask(shared_ptr<BackendSceneData> sd, unsigned int bt);
+        BoundingTask(shared_ptr<BackendSceneData> sd, unsigned int bt, size_t seed);
         virtual ~BoundingTask();
 
         virtual void Run();

source/backend/configbackend.h

@@ -99,10 +99,10 @@ static_assert(
 ///
 /// @param[in]  ts  Null-terminated byte sequence to convert.
 /// @param[out] as  Number of UCS2 characters in result.
-/// @return         Converted null-terminated UCS2 character sequence, or `NULL` if conversion is not supported.
+/// @return         Converted null-terminated UCS2 character sequence, or `nullptr` if conversion is not supported.
 ///
 #ifndef POV_CONVERT_TEXT_TO_UCS2
-    #define POV_CONVERT_TEXT_TO_UCS2(ts, as) (NULL)
+    #define POV_CONVERT_TEXT_TO_UCS2(ts, as) (nullptr)
 #endif
 
 //******************************************************************************