You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/10/14 17:01:00 UTC
svn commit: r1531931 -
/openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx
Author: alg
Date: Mon Oct 14 15:01:00 2013
New Revision: 1531931
URL: http://svn.apache.org/r1531931
Log:
i123438 Corrected crop for clipboard mitmap data preparations
Modified:
openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx
Modified: openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx?rev=1531931&r1=1531930&r2=1531931&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx (original)
+++ openoffice/trunk/main/svtools/source/graphic/grfmgr.cxx Mon Oct 14 15:01:00 2013
@@ -946,23 +946,25 @@ Graphic GraphicObject::GetTransformedGra
if( aMapGraph == MAP_PIXEL )
{
- aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel( Size( rAttr.GetLeftCrop(),
- rAttr.GetTopCrop() ),
- aMap100 );
- aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel( Size( rAttr.GetRightCrop(),
- rAttr.GetBottomCrop() ),
- aMap100 );
+ // crops are in 1/100th mm -> to aMapGraph -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100);
+ aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100);
}
else
{
- aCropLeftTop = OutputDevice::LogicToLogic( Size( rAttr.GetLeftCrop(),
- rAttr.GetTopCrop() ),
- aMap100,
- aMapGraph );
- aCropRightBottom = OutputDevice::LogicToLogic( Size( rAttr.GetRightCrop(),
- rAttr.GetBottomCrop() ),
- aMap100,
- aMapGraph );
+ // crops are in GraphicObject units -> to aMapGraph
+ aCropLeftTop = OutputDevice::LogicToLogic(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100,
+ aMapGraph);
+ aCropRightBottom = OutputDevice::LogicToLogic(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100,
+ aMapGraph);
}
// #104115# If the metafile is cropped, give it a special
@@ -1012,15 +1014,29 @@ Graphic GraphicObject::GetTransformedGra
BitmapEx aBitmapEx( aTransGraphic.GetBitmapEx() );
Rectangle aCropRect;
- // convert crops to pixel (crops are always in GraphicObject units)
+ // convert crops to pixel
if(rAttr.IsCropped())
{
- aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
- Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
- aMapGraph);
- aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
- Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
- aMapGraph);
+ if( aMapGraph == MAP_PIXEL )
+ {
+ // crops are in 1/100th mm -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMap100);
+ aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMap100);
+ }
+ else
+ {
+ // crops are in GraphicObject units -> to MAP_PIXEL
+ aCropLeftTop = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetLeftCrop(), rAttr.GetTopCrop()),
+ aMapGraph);
+ aCropRightBottom = Application::GetDefaultDevice()->LogicToPixel(
+ Size(rAttr.GetRightCrop(), rAttr.GetBottomCrop()),
+ aMapGraph);
+ }
// convert from prefmapmode to pixel
Size aSrcSizePixel(
@@ -1040,8 +1056,9 @@ Graphic GraphicObject::GetTransformedGra
// another possibility is to adapt the values created so far with a factor; this
// will keep the original Bitmap untouched and thus quality will not change
- const double fFactorX(aBitmapEx.GetSizePixel().Width() / aSrcSizePixel.Width());
- const double fFactorY(aBitmapEx.GetSizePixel().Height() / aSrcSizePixel.Height());
+ // caution: convert to double first, else pretty big errors may occurr
+ const double fFactorX((double)aBitmapEx.GetSizePixel().Width() / aSrcSizePixel.Width());
+ const double fFactorY((double)aBitmapEx.GetSizePixel().Height() / aSrcSizePixel.Height());
aCropLeftTop.Width() = basegfx::fround(aCropLeftTop.Width() * fFactorX);
aCropLeftTop.Height() = basegfx::fround(aCropLeftTop.Height() * fFactorY);