Merge branch 'master' into autobuild/alpha and bump version number.

Author: c-lipka

.gitignore

@@ -208,7 +208,6 @@ $RECYCLE.BIN/
 /stamp-h1
 # Files created by configure script in specific subdirectories
 /platform/Makefile
-/source/jversion.h
 /source/Makefile
 /unix/Makefile
 /vfe/Makefile

.travis.yml

@@ -2,24 +2,21 @@ env:
   global:
    # Required for clang.
    - CXXFLAGS="-fno-fast-math"
+
 branches:
   except:
   - /^v[0-9]/
 
 os:
 - linux
-# - osx
+- osx
 
 language: cpp
 
 compiler:
 - gcc
 - clang
 
-matrix:
-  allow_failures:
-  - os: osx
-
 sudo: false
 
 addons:

README.md

@@ -8,7 +8,21 @@ This document is still a work in progress. While the POV-Ray project itself
 has existed for more than 20 years, this is the first time we have done a
 release on github, so please bear with us - it's a little bare at the moment.
 
-Last edit: 2016-09-30
+Last edit: 2016-10-09
+
+Build Status
+--------------------------------------
+
+We're constantly monitoring the code quality of (almost) all branches and pull requests,
+to make sure the code builds ok on our major target platforms. The current status of
+our _master branch_ is reported as follows:
+
+  - [![Build status](https://ci.appveyor.com/api/projects/status/5953wf13f9soyw23/branch/master?svg=true)](https://ci.appveyor.com/project/c-lipka/povray-exwy4)
+    (AppVeyor: Windows Server 2012 with Visual Studio 2015)
+  - [![Build Status](https://semaphoreci.com/api/v1/pov-ray/povray/branches/master/shields_badge.svg)](https://semaphoreci.com/pov-ray/povray)
+    (Semaphore: Ubuntu 14.04 LTE 64-bit with gcc 4.8)
+  - [![Build Status](https://travis-ci.org/POV-Ray/povray.svg?branch=master)](https://travis-ci.org/POV-Ray/povray)
+    (Travis CI: Ubuntu 12.04 LTE 64-bit with gcc 4.6 and with clang 4.2; OS X 10.11 with gcc 4.2 and with clang 4.2)
 
 License
 --------------------------------------

source-doc/styleguide.md

@@ -220,6 +220,9 @@ Miscellaneous Coding Rules
   - **Output Parameters**: When declaring a function that is to modify any of its parameters, prefer references over
     pointers.
 
+  - **Locale**: Do not tamper with the C locale (i.e. do not call `setlocale` or any other function doing the same job),
+    as plenty of code in POV-Ray relies on it remaining set to the default.
+
 
 Code Documentation
 ==================

source/backend/povray.cpp

@@ -66,7 +66,15 @@
         #include <png.h>
     #endif
     #ifndef LIBJPEG_MISSING
-        #include <jversion.h>
+        #include <jpeglib.h>
+        #ifndef JPEG_LIB_VERSION_MAJOR
+            #define JPEG_LIB_VERSION_MAJOR (JPEG_LIB_VERSION / 10)
+        #endif
+        #ifndef JPEG_LIB_VERSION_MINOR
+            // This is known to erroneously identify versions 8a and 8b as version 8,
+            // but we'll live with that.
+            #define JPEG_LIB_VERSION_MINOR (JPEG_LIB_VERSION % 10)
+        #endif
     #endif
     #ifndef LIBTIFF_MISSING
         extern "C"
@@ -400,10 +408,9 @@ void BuildInitInfo(POVMSObjectPtr msg)
         err = POVMSAttr_New(&attr);
         if(err == kNoErr)
         {
-            ExtractLibraryVersion(JVERSION, buffer);
-
-            // TODO FIXME - shouldn't we use the JCOPYRIGHT string instead of hard-coding it here?
-            const char *tempstr = pov_tsprintf("LibJPEG %s, Copyright 1991-2013 Thomas G. Lane, Guido Vollbeding", buffer);
+            const char minorStr[2] = { JPEG_LIB_VERSION_MINOR ? 'a'+JPEG_LIB_VERSION_MINOR-1 : '\0', '\0' };
+            const char *tempstr = pov_tsprintf("LibJPEG %i%s, Copyright 1991-2016 Thomas G. Lane, Guido Vollbeding",
+                                               JPEG_LIB_VERSION_MAJOR, minorStr);
 
             err = POVMSAttr_Set(&attr, kPOVMSType_CString, reinterpret_cast<const void *>(tempstr), (int) strlen(tempstr) + 1);
             if(err == kNoErr)

source/base/image/colourspace.cpp

@@ -441,7 +441,7 @@ SimpleGammaCurvePtr GetGammaCurve(GammaTypeId type, float param)
         case kPOVList_GammaType_BT709:      return BT709GammaCurve::Get();
         case kPOVList_GammaType_BT1361:     return BT1361GammaCurve::Get();
         case kPOVList_GammaType_BT2020:     return BT2020GammaCurve::Get();
-        default:                            return PowerLawGammaCurve::GetByDecodingGamma(DEFAULT_FILE_GAMMA);
+        default:                            POV_ASSERT (false);
     }
 }
 

source/base/image/image.cpp

@@ -54,7 +54,6 @@
 #include "base/image/iff.h"
 #include "base/image/jpeg_pov.h"
 #include "base/image/openexr.h"
-#include "base/image/pgm.h"
 #include "base/image/png_pov.h"
 #include "base/image/ppm.h"
 #include "base/image/targa.h"
@@ -3555,6 +3554,70 @@ void RGBFTMap2RGBAMap(const vector<Image::RGBFTMapEntry>& m, vector<Image::RGBAM
         n.push_back(Image::RGBAMapEntry(i->red, i->green, i->blue, RGBFTColour::FTtoA(i->filter, i->transm)));
 }
 
+Image::ImageDataType Image::GetImageDataType (ImageChannelDataType channelType, ImageChannelLayout layout)
+{
+    switch (layout)
+    {
+    case kImageChannelLayout_Gray:
+        switch (channelType)
+        {
+        case kImageChannelDataType_Int8:    return Image::Gray_Int8;
+        case kImageChannelDataType_Int16:   return Image::Gray_Int16;
+        case kImageChannelDataType_Gamma8:  return Image::Gray_Gamma8;
+        case kImageChannelDataType_Gamma16: return Image::Gray_Gamma16;
+        default:
+            POV_IMAGE_ASSERT(false);
+            break;
+        }
+        break;
+
+    case kImageChannelLayout_GrayA:
+        switch (channelType)
+        {
+        case kImageChannelDataType_Int8:    return Image::GrayA_Int8;
+        case kImageChannelDataType_Int16:   return Image::GrayA_Int16;
+        case kImageChannelDataType_Gamma8:  return Image::GrayA_Gamma8;
+        case kImageChannelDataType_Gamma16: return Image::GrayA_Gamma16;
+        default:
+            POV_IMAGE_ASSERT(false);
+            break;
+        }
+        break;
+
+    case kImageChannelLayout_RGB:
+        switch (channelType)
+        {
+        case kImageChannelDataType_Int8:    return Image::RGB_Int8;
+        case kImageChannelDataType_Int16:   return Image::RGB_Int16;
+        case kImageChannelDataType_Gamma8:  return Image::RGB_Gamma8;
+        case kImageChannelDataType_Gamma16: return Image::RGB_Gamma16;
+        default:
+            POV_IMAGE_ASSERT(false);
+            break;
+        }
+        break;
+
+    case kImageChannelLayout_RGBA:
+        switch (channelType)
+        {
+        case kImageChannelDataType_Int8:    return Image::RGBA_Int8;
+        case kImageChannelDataType_Int16:   return Image::RGBA_Int16;
+        case kImageChannelDataType_Gamma8:  return Image::RGBA_Gamma8;
+        case kImageChannelDataType_Gamma16: return Image::RGBA_Gamma16;
+        default:
+            POV_IMAGE_ASSERT(false);
+            break;
+        }
+        break;
+
+    default:
+        POV_IMAGE_ASSERT(false);
+        break;
+    }
+
+    return Image::Undefined;
+}
+
 Image *Image::Create(unsigned int w, unsigned int h, ImageDataType t, unsigned int maxRAMmbHint, unsigned int pixelsPerBlockHint)
 {
     try
@@ -3904,10 +3967,10 @@ following built-in formats: GIF, TGA, IFF, PGM, PPM, BMP.");
             return (Iff::Read(file, options));
 
         case PGM:
-            return (Pgm::Read(file, options));
+            return (Netpbm::Read(file, options));
 
         case PPM:
-            return (Ppm::Read(file, options));
+            return (Netpbm::Read(file, options));
 
         case BMP:
             return (Bmp::Read(file, options));
@@ -3997,7 +4060,7 @@ following built-in formats: TGA, PPM, BMP.");
             break;
 
         case PPM:
-            Ppm::Write(file, image, options);
+            Netpbm::Write(file, image, options);
             break;
 
         case BMP:

source/base/image/image.h

@@ -104,6 +104,22 @@ class Image
             RGBFTColourMap
         };
 
+        enum ImageChannelDataType
+        {
+            kImageChannelDataType_Int8,
+            kImageChannelDataType_Int16,
+            kImageChannelDataType_Gamma8,
+            kImageChannelDataType_Gamma16,
+        };
+
+        enum ImageChannelLayout
+        {
+            kImageChannelLayout_Gray,
+            kImageChannelLayout_GrayA,
+            kImageChannelLayout_RGB,
+            kImageChannelLayout_RGBA,
+        };
+
         enum ImageDataType
         {
             /// Value used to indicate that image decoder is free to pick the most fitting type.
@@ -190,14 +206,16 @@ class Image
             bool premultiplyOverride;           // whether to override file-format default for alpha premultiplication
             bool premultiply;                   // whether to output premultiplied ("associated") alpha or not ("straight alpha")
             DitherHandlerPtr dither;
-            unsigned int offset_x;
-            unsigned int offset_y;
+            unsigned int offset_x;              ///< Currently not actively set.
+            unsigned int offset_y;              ///< Currently not actively set.
 
             WriteOptions() : bpcc(8), alphachannel(false), grayscale(false), compress(0) /*, gamma(1.0f) */, premultiplyOverride(false), premultiply(false), offset_x(0), offset_y(0) { }
         };
 
         virtual ~Image() { }
 
+        static ImageDataType GetImageDataType (ImageChannelDataType channelType, ImageChannelLayout layout);
+
         static Image *Create(unsigned int w, unsigned int h, ImageDataType t, unsigned int maxRAMmbHint, unsigned int pixelsPerBlockHint);
         static Image *Create(unsigned int w, unsigned int h, ImageDataType t, bool allowFileBacking = false);
         static Image *Create(unsigned int w, unsigned int h, ImageDataType t, const vector<RGBMapEntry>& m, bool allowFileBacking = false);