paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 15:29:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Use constant for formatting floats, adjust sign/precision argument

Browse Source 
git-svn-id: trunk@39585 -
This commit is contained in:
michael 2018-08-07 08:12:23 +00:00
parent 669259bf5d
commit 7e6416b1f4
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/fcl-pdf/src/fppdf.pp
View File

@ -1126,6 +1126,7 @@ const
PDF_MAX_GEN_NUM = 65535; PDF_MAX_GEN_NUM = 65535;
PDF_UNICODE_HEADER = 'FEFF001B%s001B'; PDF_UNICODE_HEADER = 'FEFF001B%s001B';
PDF_LANG_STRING = 'en'; PDF_LANG_STRING = 'en';
PDF_NUMBER_MASK = '0.####';
{ Info from http://www.papersizes.org/a-sizes-all-units.htm } { Info from http://www.papersizes.org/a-sizes-all-units.htm }
PDFPaperSizes : Array[TPDFPaperType,0..1] of Integer = ( PDFPaperSizes : Array[TPDFPaperType,0..1] of Integer = (
@ -2313,9 +2314,9 @@ begin
if ADegrees <> 0.0 then if ADegrees <> 0.0 then
begin begin
rad := DegToRad(-ADegrees); rad := DegToRad(-ADegrees);
t1 := FormatFloat('0.###;;0', Cos(rad), PDFFormatSettings); t1 := FormatFloat(PDF_NUMBER_MASK, Cos(rad), PDFFormatSettings);
t2 := FormatFloat('0.###;;0', -Sin(rad), PDFFormatSettings); t2 := FormatFloat(PDF_NUMBER_MASK, -Sin(rad), PDFFormatSettings);
t3 := FormatFloat('0.###;;0', Sin(rad), PDFFormatSettings); t3 := FormatFloat(PDF_NUMBER_MASK, Sin(rad), PDFFormatSettings);
AddObject(TPDFPushGraphicsStack.Create(Document)); AddObject(TPDFPushGraphicsStack.Create(Document));
// PDF v1.3 page 132 & 143 // PDF v1.3 page 132 & 143
AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm', AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm',
@ -2357,9 +2358,9 @@ begin
if ADegrees <> 0.0 then if ADegrees <> 0.0 then
begin begin
rad := DegToRad(-ADegrees); rad := DegToRad(-ADegrees);
t1 := FormatFloat('0.###;;0', Cos(rad), PDFFormatSettings); t1 := FormatFloat(PDF_NUMBER_MASK, Cos(rad), PDFFormatSettings);
t2 := FormatFloat('0.###;;0', -Sin(rad), PDFFormatSettings); t2 := FormatFloat(PDF_NUMBER_MASK, -Sin(rad), PDFFormatSettings);
t3 := FormatFloat('0.###;;0', Sin(rad), PDFFormatSettings); t3 := FormatFloat(PDF_NUMBER_MASK, Sin(rad), PDFFormatSettings);
AddObject(TPDFPushGraphicsStack.Create(Document)); AddObject(TPDFPushGraphicsStack.Create(Document));
// PDF v1.3 page 132 & 143 // PDF v1.3 page 132 & 143
AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm', AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm',
@ -2388,9 +2389,9 @@ begin
if ADegrees <> 0.0 then if ADegrees <> 0.0 then
begin begin
rad := DegToRad(-ADegrees); rad := DegToRad(-ADegrees);
t1 := FormatFloat('0.###;;0', Cos(rad), PDFFormatSettings); t1 := FormatFloat(PDF_NUMBER_MASK, Cos(rad), PDFFormatSettings);
t2 := FormatFloat('0.###;;0', -Sin(rad), PDFFormatSettings); t2 := FormatFloat(PDF_NUMBER_MASK, -Sin(rad), PDFFormatSettings);
t3 := FormatFloat('0.###;;0', Sin(rad), PDFFormatSettings); t3 := FormatFloat(PDF_NUMBER_MASK, Sin(rad), PDFFormatSettings);
AddObject(TPDFPushGraphicsStack.Create(Document)); AddObject(TPDFPushGraphicsStack.Create(Document));
// PDF v1.3 page 132 & 143 // PDF v1.3 page 132 & 143
AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm', AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm',
@ -2427,9 +2428,9 @@ begin
if ADegrees <> 0.0 then if ADegrees <> 0.0 then
begin begin
rad := DegToRad(-ADegrees); rad := DegToRad(-ADegrees);
t1 := FormatFloat('0.###;;0', Cos(rad), PDFFormatSettings); t1 := FormatFloat(PDF_NUMBER_MASK, Cos(rad), PDFFormatSettings);
t2 := FormatFloat('0.###;;0', -Sin(rad), PDFFormatSettings); t2 := FormatFloat(PDF_NUMBER_MASK, -Sin(rad), PDFFormatSettings);
t3 := FormatFloat('0.###;;0', Sin(rad), PDFFormatSettings); t3 := FormatFloat(PDF_NUMBER_MASK, Sin(rad), PDFFormatSettings);
AddObject(TPDFPushGraphicsStack.Create(Document)); AddObject(TPDFPushGraphicsStack.Create(Document));
// PDF v1.3 page 132 & 143 // PDF v1.3 page 132 & 143
AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm', AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm',
@ -2466,9 +2467,9 @@ begin
if ADegrees <> 0.0 then if ADegrees <> 0.0 then
begin begin
rad := DegToRad(-ADegrees); rad := DegToRad(-ADegrees);
t1 := FormatFloat('0.###;;0', Cos(rad), PDFFormatSettings); t1 := FormatFloat(PDF_NUMBER_MASK, Cos(rad), PDFFormatSettings);
t2 := FormatFloat('0.###;;0', -Sin(rad), PDFFormatSettings); t2 := FormatFloat(PDF_NUMBER_MASK, -Sin(rad), PDFFormatSettings);
t3 := FormatFloat('0.###;;0', Sin(rad), PDFFormatSettings); t3 := FormatFloat(PDF_NUMBER_MASK, Sin(rad), PDFFormatSettings);
AddObject(TPDFPushGraphicsStack.Create(Document)); AddObject(TPDFPushGraphicsStack.Create(Document));
// PDF v1.3 page 132 & 143 // PDF v1.3 page 132 & 143
AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm', AddObject(TPDFFreeFormString.Create(Document, Format('%s %s %s %s %.4f %.4f cm',