Browse Source

* Fix dotted units compilation.

Michaël Van Canneyt 2 days ago
parent
commit
e4fc454e4f
1 changed files with 5 additions and 5 deletions
  1. 5 5
      packages/fcl-pdf/src/fppdf.pp

+ 5 - 5
packages/fcl-pdf/src/fppdf.pp

@@ -79,10 +79,10 @@ Const
 
 
   //MaxM: since now TPDFUnitOfMeasure = FpUnitOfMeasure.TUnitOfMeasure we declare constants here so
   //MaxM: since now TPDFUnitOfMeasure = FpUnitOfMeasure.TUnitOfMeasure we declare constants here so
   //      packages using fcl-pdf will not have to add the FpUnitOfMeasure unit in the uses section
   //      packages using fcl-pdf will not have to add the FpUnitOfMeasure unit in the uses section
-  uomInches = FpUnitOfMeasure.uomInches;
-  uomMillimeters = FpUnitOfMeasure.uomMillimeters;
-  uomCentimeters = FpUnitOfMeasure.uomCentimeters;
-  uomPixels = FpUnitOfMeasure.uomPixels;
+  uomInches = {$IFDEF FPC_DOTTEDUNITS}FpImage.{$endif}FpUnitOfMeasure.uomInches;
+  uomMillimeters = {$IFDEF FPC_DOTTEDUNITS}FpImage.{$endif}FpUnitOfMeasure.uomMillimeters;
+  uomCentimeters = {$IFDEF FPC_DOTTEDUNITS}FpImage.{$endif}FpUnitOfMeasure.uomCentimeters;
+  uomPixels = {$IFDEF FPC_DOTTEDUNITS}FpImage.{$endif}FpUnitOfMeasure.uomPixels;
 
 
 type
 type
   TPDFPaperType = (ptCustom, ptA4, ptA5, ptLetter, ptLegal, ptExecutive, ptComm10, ptMonarch, ptDL, ptC5, ptB5);
   TPDFPaperType = (ptCustom, ptA4, ptA5, ptLetter, ptLegal, ptExecutive, ptComm10, ptMonarch, ptDL, ptC5, ptB5);
@@ -91,7 +91,7 @@ type
   TPDFLineCapStyle = (plcsButtCap, plcsRoundCap, plcsProjectingSquareCap);
   TPDFLineCapStyle = (plcsButtCap, plcsRoundCap, plcsProjectingSquareCap);
   TPDFLineJoinStyle = (pljsMiterJoin, pljsRoundJoin, pljsBevelJoin);
   TPDFLineJoinStyle = (pljsMiterJoin, pljsRoundJoin, pljsBevelJoin);
   TPDFPageLayout = (lSingle, lTwo, lContinuous);
   TPDFPageLayout = (lSingle, lTwo, lContinuous);
-  TPDFUnitOfMeasure = FpUnitOfMeasure.TUnitOfMeasure;
+  TPDFUnitOfMeasure = {$IFDEF FPC_DOTTEDUNITS}FpImage.{$endif}FpUnitOfMeasure.TUnitOfMeasure;
 
 
   TPDFOption = (poOutLine, poCompressText, poCompressFonts, poCompressImages, poUseRawJPEG, poNoEmbeddedFonts,
   TPDFOption = (poOutLine, poCompressText, poCompressFonts, poCompressImages, poUseRawJPEG, poNoEmbeddedFonts,
     poPageOriginAtTop, poSubsetFont, poMetadataEntry, poNoTrailerID, poUseImageTransparency,poUTF16info);
     poPageOriginAtTop, poSubsetFont, poMetadataEntry, poNoTrailerID, poUseImageTransparency,poUTF16info);