Skip to content

Commit

Permalink
Merge branch 'experimental/freetype' into autobuild/freetype
Browse files Browse the repository at this point in the history
  • Loading branch information
c-lipka committed Jun 7, 2021
2 parents 2a26f22 + 0ea9d6b commit b0383a7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,6 @@ for:
release: $(pov_build_title) $(pov_build_version)
description: $(pov_build_message)
auth_token:
secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
secure: Il7kbUpGx5Fx4ioI7cmEpEciqsq27HYiT/i4RYivOjfetfCLfMNQhIXEFGzvovoo
draft: true
prerelease: true
6 changes: 3 additions & 3 deletions source/base/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/// @parblock
///
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
/// Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd.
/// Copyright 1991-2021 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
Expand Down Expand Up @@ -66,7 +66,7 @@
/// @{

/// Copyright string.
#define POV_RAY_COPYRIGHT "Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd."
#define POV_RAY_COPYRIGHT "Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd."

/// First numerical component of official source code version ("major version") as integer.
/// Increment this field (and set all subsequent fields to zero) to indicate a groundbreaking
Expand Down Expand Up @@ -100,7 +100,7 @@
/// where `N` is a serial number starting at 1 in each phase, `TIME` is the number of minutes
/// since 2000-01-01 00:00, and `FEATURE` is an arbitrary alphanumeric moniker for a particular
/// experimental feature.
#define POV_RAY_PRERELEASE "x.freetype.3"
#define POV_RAY_PRERELEASE "x.freetype.4"

#if defined(DOXYGEN) && !defined(POV_RAY_PRERELEASE)
// Work around doxygen being unable to document undefined macros.
Expand Down
2 changes: 1 addition & 1 deletion source/parser/parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6215,7 +6215,7 @@ ObjectPtr Parser::Parse_TrueType ()
prism->Height1 = -depth;
prism->Height2 = 0;
prism->Number = controlPoints.size();
prism->Compute_Prism(controlPoints.data(), GetParserDataPtr());
prism->Compute_Prism(controlPoints.data(), GetParserDataPtr()->Stats());
prism->Compute_BBox();
prisms.push_back(prism);
}
Expand Down

0 comments on commit b0383a7

Please sign in to comment.