Skip to content

Commit b0383a7

Browse files
committed
Merge branch 'experimental/freetype' into autobuild/freetype
2 parents 2a26f22 + 0ea9d6b commit b0383a7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ for:
105105
release: $(pov_build_title) $(pov_build_version)
106106
description: $(pov_build_message)
107107
auth_token:
108-
secure: WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK
108+
secure: Il7kbUpGx5Fx4ioI7cmEpEciqsq27HYiT/i4RYivOjfetfCLfMNQhIXEFGzvovoo
109109
draft: true
110110
prerelease: true

source/base/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/// @parblock
1313
///
1414
/// Persistence of Vision Ray Tracer ('POV-Ray') version 3.8.
15-
/// Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd.
15+
/// Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd.
1616
///
1717
/// POV-Ray is free software: you can redistribute it and/or modify
1818
/// it under the terms of the GNU Affero General Public License as
@@ -66,7 +66,7 @@
6666
/// @{
6767

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

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

105105
#if defined(DOXYGEN) && !defined(POV_RAY_PRERELEASE)
106106
// Work around doxygen being unable to document undefined macros.

source/parser/parser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6215,7 +6215,7 @@ ObjectPtr Parser::Parse_TrueType ()
62156215
prism->Height1 = -depth;
62166216
prism->Height2 = 0;
62176217
prism->Number = controlPoints.size();
6218-
prism->Compute_Prism(controlPoints.data(), GetParserDataPtr());
6218+
prism->Compute_Prism(controlPoints.data(), GetParserDataPtr()->Stats());
62196219
prism->Compute_BBox();
62206220
prisms.push_back(prism);
62216221
}

0 commit comments

Comments
 (0)