mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS thb30fixes (1.18.74); FILE MERGED

Browse Source 
2008/06/20 15:22:28 thb 1.18.74.1: #i48108# More accuracy in calculating logical resolution
This commit is contained in:
Rüdiger Timm
2008-07-11 06:11:04 +00:00
parent defb8e0046
commit bcf7da6f46
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vcl/source/gdi/bitmap2.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: bitmap2.cxx,v $ * $RCSfile: bitmap2.cxx,v $
* $Revision: 1.18 $ * $Revision: 1.19 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -750,12 +750,24 @@ BOOL Bitmap::ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompre
if( maPrefSize.Width() && maPrefSize.Height() && ( maPrefMapMode != aMapPixel ) ) if( maPrefSize.Width() && maPrefSize.Height() && ( maPrefMapMode != aMapPixel ) )
{ {
const Size aSize100( OutputDevice::LogicToLogic( maPrefSize, maPrefMapMode, MAP_100TH_MM ) ); // #i48108# Try to recover xpels/ypels as previously stored on
// disk. The problem with just converting maPrefSize to 100th
if( aSize100.Width() && aSize100.Height() ) // mm and then relating that to the bitmap pixel size is that
// MapMode is integer-based, and suffers from roundoffs,
// especially if maPrefSize is small. Trying to circumvent
// that by performing part of the math in floating point.
const Size aScale10000(
OutputDevice::LogicToLogic( Size(100000L,
100000L),
maPrefMapMode,
MAP_100TH_MM ) );
const double fScaleX((double)aScale10000.Width() * maPrefSize.Width());
const double fScaleY((double)aScale10000.Height() * maPrefSize.Height());
if( fabs(fScaleX) > 0.000000001 &&
fabs(fScaleY) > 0.000000001 )
{ {
aHeader.nXPelsPerMeter = ( rAcc.Width() * 100000UL ) / aSize100.Width(); aHeader.nXPelsPerMeter = (UINT32)(rAcc.Width() / fScaleX + .5);
aHeader.nYPelsPerMeter = ( rAcc.Height() * 100000UL ) / aSize100.Height(); aHeader.nYPelsPerMeter = (UINT32)(rAcc.Height() / fScaleY + .5);
} }
} }