From 02dbec2085772ad463d5a3302f3b0f064d4a3d33 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sat, 19 Mar 2016 20:40:55 +0000
Subject: [PATCH]  * X,YPelsPerMeter properties. Kept old (not logical) default
 of 100 out of compatibility. Bug #29852

git-svn-id: trunk@33291 -
---
 packages/fcl-image/src/fpreadbmp.pp  |  2 ++
 packages/fcl-image/src/fpwritebmp.pp | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/fcl-image/src/fpreadbmp.pp b/packages/fcl-image/src/fpreadbmp.pp
index ded68c031c..9b3831a42b 100644
--- a/packages/fcl-image/src/fpreadbmp.pp
+++ b/packages/fcl-image/src/fpreadbmp.pp
@@ -62,6 +62,8 @@ type
     public
       constructor Create; override;
       destructor Destroy; override;
+      property XPelsPerMeter : integer read BFI.XPelsPerMeter;
+      property YPelsPerMeter : integer read BFI.YPelsPerMeter;
   end;
 
 implementation
diff --git a/packages/fcl-image/src/fpwritebmp.pp b/packages/fcl-image/src/fpwritebmp.pp
index 8523abd49e..5628cde7fb 100644
--- a/packages/fcl-image/src/fpwritebmp.pp
+++ b/packages/fcl-image/src/fpwritebmp.pp
@@ -37,6 +37,8 @@ type
     BFH : TBitMapFileHeader;
     BFI : TBitMapInfoHeader;
     Colinfo : array of TColorRGBA;
+    fXPelsPerMeter,
+    fYPelsPerMeter : integer;
     procedure SetColorSize (AValue : Byte);
     function GetColorSize : byte;
     procedure SetBpp (const abpp : byte);
@@ -54,6 +56,8 @@ type
   public
     constructor Create; override;
     property BitsPerPixel : byte read FBpp write SetBpp;
+    property XPelsPerMeter : integer read fXPelsPerMeter write fXPelsPerMeter;
+    property YPelsPerMeter : integer read fYPelsPerMeter write fYPelsPerMeter;
     property RLECompress : boolean read FRleCompress write FRleCompress;
   end;
 
@@ -86,6 +90,8 @@ end;
 constructor TFPWriterBMP.create;
 begin
   inherited create;
+  fXPelsPerMeter:=100;
+  fYPelsPerMeter:=100;
   FBpp:=24;
   FRleCompress:=false;
 end;
@@ -247,8 +253,8 @@ begin
     Planes:=1;
     if FBpp=15 then BitCount:=16
     else BitCount:=FBpp;
-    XPelsPerMeter:=100;
-    YPelsPerMeter:=100;
+    XPelsPerMeter:=fXPelsPerMeter;
+    YPelsPerMeter:=fYPelsPerMeter;
     ClrImportant:=0;
     end;
   with BFH do