Commitb0383a7

committed

Merge branch 'experimental/freetype' into autobuild/freetype

2 parents2a26f22 +0ea9d6b commitb0383a7Copy full SHA for b0383a7

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,6 @@ for:`
`105`	`105`	`release:$(pov_build_title) $(pov_build_version)`
`106`	`106`	`description:$(pov_build_message)`
`107`	`107`	`auth_token:`
`108`		`-secure:WkcFPXyr/SJ9TXixTQyivhfoR9FzlryIbc4deHeQ0eA6YRXL0wQopMYJ6XL1/FJK`
	`108`	`+secure:Il7kbUpGx5Fx4ioI7cmEpEciqsq27HYiT/i4RYivOjfetfCLfMNQhIXEFGzvovoo`
`109`	`109`	`draft:true`
`110`	`110`	`prerelease:true`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/// @parblock`
`13`	`13`	`///`
`14`	`14`	`/// 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.`
`16`	`16`	`///`
`17`	`17`	`/// POV-Ray is free software: you can redistribute it and/or modify`
`18`	`18`	`/// it under the terms of the GNU Affero General Public License as`
`@@ -66,7 +66,7 @@`
`66`	`66`	`/// @{`
`67`	`67`
`68`	`68`	`/// Copyright string.`
`69`		`-#definePOV_RAY_COPYRIGHT "Copyright 1991-2019 Persistence of Vision Raytracer Pty. Ltd."`
	`69`	`+#definePOV_RAY_COPYRIGHT "Copyright 1991-2021 Persistence of Vision Raytracer Pty. Ltd."`
`70`	`70`
`71`	`71`	`/// First numerical component of official source code version ("major version") as integer.`
`72`	`72`	`/// Increment this field (and set all subsequent fields to zero) to indicate a groundbreaking`
`@@ -100,7 +100,7 @@`
`100`	`100`	/// where `N` is a serial number starting at 1 in each phase, `TIME` is the number of minutes
`101`	`101`	/// since 2000-01-01 00:00, and `FEATURE` is an arbitrary alphanumeric moniker for a particular
`102`	`102`	`/// experimental feature.`
`103`		`-#definePOV_RAY_PRERELEASE "x.freetype.3"`
	`103`	`+#definePOV_RAY_PRERELEASE "x.freetype.4"`
`104`	`104`
`105`	`105`	`#if defined(DOXYGEN)&& !defined(POV_RAY_PRERELEASE)`
`106`	`106`	`// Work around doxygen being unable to document undefined macros.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6215,7 +6215,7 @@ ObjectPtr Parser::Parse_TrueType ()`
`6215`	`6215`	`prism->Height1 = -depth;`
`6216`	`6216`	`prism->Height2 =0;`
`6217`	`6217`	`prism->Number = controlPoints.size();`
`6218`		`- prism->Compute_Prism(controlPoints.data(),GetParserDataPtr());`
	`6218`	`+ prism->Compute_Prism(controlPoints.data(),GetParserDataPtr()->Stats());`
`6219`	`6219`	`prism->Compute_BBox();`
`6220`	`6220`	`prisms.push_back(prism);`
`6221`	`6221`	`}`

Comments

(0)