[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/inc
vcl/inc/unx/x11_cursors/airbrush_curs.h | 42 -- vcl/inc/unx/x11_cursors/airbrush_mask.h | 42 -- vcl/inc/unx/x11_cursors/ase_curs.h | 42 -- vcl/inc/unx/x11_cursors/ase_mask.h | 41 +++--- vcl/inc/unx/x11_cursors/asn_curs.h | 42 -- vcl/inc/unx/x11_cursors/asn_mask.h | 42 -- vcl/inc/unx/x11_cursors/asne_curs.h | 42 -- vcl/inc/unx/x11_cursors/asne_mask.h | 42 -- vcl/inc/unx/x11_cursors/asns_curs.h | 42 -- vcl/inc/unx/x11_cursors/asns_mask.h | 42 -- vcl/inc/unx/x11_cursors/asnswe_curs.h | 42 -- vcl/inc/unx/x11_cursors/asnswe_mask.h | 42 -- vcl/inc/unx/x11_cursors/asnw_curs.h | 42 -- vcl/inc/unx/x11_cursors/asnw_mask.h | 42 -- vcl/inc/unx/x11_cursors/ass_curs.h | 42 -- vcl/inc/unx/x11_cursors/ass_mask.h | 42 -- vcl/inc/unx/x11_cursors/asse_curs.h | 42 -- vcl/inc/unx/x11_cursors/asse_mask.h | 42 -- vcl/inc/unx/x11_cursors/assw_curs.h | 42 -- vcl/inc/unx/x11_cursors/assw_mask.h | 42 -- vcl/inc/unx/x11_cursors/asw_curs.h | 42 -- vcl/inc/unx/x11_cursors/asw_mask.h | 42 -- vcl/inc/unx/x11_cursors/aswe_curs.h | 42 -- vcl/inc/unx/x11_cursors/aswe_mask.h | 42 -- vcl/inc/unx/x11_cursors/chain_curs.h| 42 -- vcl/inc/unx/x11_cursors/chain_mask.h| 44 -- vcl/inc/unx/x11_cursors/chainnot_curs.h | 42 -- vcl/inc/unx/x11_cursors/chainnot_mask.h | 44 -- vcl/inc/unx/x11_cursors/chart_curs.h| 42 -- vcl/inc/unx/x11_cursors/chart_mask.h| 42 -- vcl/inc/unx/x11_cursors/copydata_curs.h | 44 -- vcl/inc/unx/x11_cursors/copydata_mask.h | 44 -- vcl/inc/unx/x11_cursors/copydlnk_curs.h | 44 -- vcl/inc/unx/x11_cursors/copydlnk_mask.h | 44 -- vcl/inc/unx/x11_cursors/copyfile_curs.h | 44 -- vcl/inc/unx/x11_cursors/copyfile_mask.h | 44 -- vcl/inc/unx/x11_cursors/copyfiles_curs.h| 44 -- vcl/inc/unx/x11_cursors/copyfiles_mask.h| 44 -- vcl/inc/unx/x11_cursors/copyflnk_curs.h | 44 -- vcl/inc/unx/x11_cursors/copyflnk_mask.h | 44 -- vcl/inc/unx/x11_cursors/crook_curs.h| 44 -- vcl/inc/unx/x11_cursors/crook_mask.h| 46 --- vcl/inc/unx/x11_cursors/crop_curs.h | 44 -- vcl/inc/unx/x11_cursors/crop_mask.h | 46 --- vcl/inc/unx/x11_cursors/detective_curs.h| 42 -- vcl/inc/unx/x11_cursors/detective_mask.h| 42 -- vcl/inc/unx/x11_cursors/drawarc_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawarc_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawbezier_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawbezier_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawcaption_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawcaption_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawcirclecut_curs.h| 44 -- vcl/inc/unx/x11_cursors/drawcirclecut_mask.h| 46 --- vcl/inc/unx/x11_cursors/drawconnect_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawconnect_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawcrook_curs.h| 44 -- vcl/inc/unx/x11_cursors/drawcrook_mask.h| 46 --- vcl/inc/unx/x11_cursors/drawcrop_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawcrop_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawellipse_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawellipse_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawfreehand_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawfreehand_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawline_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawline_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawmirror_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawmirror_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawpie_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawpie_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawpolygon_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawpolygon_mask.h | 46 --- vcl/inc/unx/x11_cursors/drawrect_curs.h | 44 -- vcl/inc/unx/x11_cursors/drawrect_mask.h | 46 --- vcl/inc/unx/x11_cursors/
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/inc vcl/source
vcl/inc/vcl/bitmapex.hxx| 23 +
vcl/inc/vcl/bmpacc.hxx | 10 ++
vcl/source/gdi/bitmapex.cxx | 176
vcl/source/gdi/bmpacc.cxx | 120 ++
vcl/source/gdi/outdev2.cxx | 125 ---
5 files changed, 313 insertions(+), 141 deletions(-)
New commits:
commit 75e9010730525ed6122655ac3c3899359c305104
Author: Armin Le Grand
Date: Tue Aug 27 12:46:41 2013 +
i122778 Enhanced own transformer for drawing transformed bitmaps which is
used in the cases where no fallback for direct system support is there (Linux)
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index a7663bd..cfc7a8f 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -393,25 +393,42 @@ public:
@param rTransformation
The back transformation for each pixel in (0 .. fWidth),(0 .. fHeight)
to
local pixel coordiantes
+
+@param bSmooth
+Defines if pixel interpolation is to be used to create the result
*/
BitmapEx TransformBitmapEx(
double fWidth,
double fHeight,
-const basegfx::B2DHomMatrix& rTransformation) const;
+const basegfx::B2DHomMatrix& rTransformation,
+bool bSmooth = true) const;
/** Create transformed Bitmap
@param rTransformation
-The transformation from unit coordinates to target
+The transformation from unit coordinates to the unit range
+
+@param rVisibleRange
+The relative visible range in unit coordinates, relative to (0,0,1,1)
which
+defines the whole target area
@param fMaximumArea
A limitation for the maximum size of pixels to use for the result
+@param bSmooth
+Defines if pixel interpolation is to be used to create the result
+
+The traget size of the result bitmap is defined by transforming the
given
+rTargetRange with the given rTransformation; the area of the result is
+linearly scaled to not exceed the given fMaximumArea
+
@return The transformed bitmap
*/
BitmapEx getTransformed(
const basegfx::B2DHomMatrix& rTransformation,
-double fMaximumArea = 50.0) const;
+const basegfx::B2DRange& rVisibleRange,
+double fMaximumArea = 50.0,
+bool bSmooth = true) const;
/** Create ColorStack-modified version of this BitmapEx
diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index c22e865..2a51304 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.hxx
@@ -171,6 +171,16 @@ public:
inline BitmapColor GetColor( long nY, long nX ) const;
inline sal_uInt8GetPixelIndex( long nY, long nX ) const;
inline sal_uInt8GetLuminance( long nY, long nX ) const;
+
+/** Get the interpolated color at coordinates fY, fX; if outside, return
rFallback */
+BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const
BitmapColor& rFallback ) const;
+
+/** Get the color at coordinates fY, fX; if outside, return rFallback.
Automatically does the correct
+inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0,
not -1 and has to be outside */
+BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor&
rFallback ) const;
+
+/** Get the color at coordinates nY, nX; if outside, return rFallback */
+BitmapColor GetColorWithFallback( long nY, long nX, const BitmapColor&
rFallback ) const;
};
// -
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 6925142..5e34624b 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -837,87 +837,6 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX,
sal_Int32 nY) const
namespace
{
-void impSmoothPoint(BitmapColor& rValue, const basegfx::B2DPoint& rSource,
sal_Int32 nIntX, sal_Int32 nIntY, BitmapReadAccess& rRead)
-{
-double fDeltaX(rSource.getX() - nIntX);
-double fDeltaY(rSource.getY() - nIntY);
-sal_Int32 nIndX(0L);
-sal_Int32 nIndY(0L);
-
-if(fDeltaX > 0.0 && nIntX + 1L < rRead.Width())
-{
-nIndX++;
-}
-else if(fDeltaX < 0.0 && nIntX >= 1L)
-{
-fDeltaX = -fDeltaX;
-nIndX--;
-}
-
-if(fDeltaY > 0.0 && nIntY + 1L < rRead.Height())
-{
-nIndY++;
-}
-else if(fDeltaY < 0.0 && nIntY >= 1L)
-{
-fDeltaY = -fDeltaY;
-nIndY--;
-}
-
-if(nIndX || nIndY)
-{
-const double fColorToReal(1.0 / 255.0);
-double fR(rValue.GetRed() * fColorToReal);
-double fG(rValue.GetGreen() * fColorToReal);
-double fB(rValue.GetBlue() * fColorToReal);
-double fRBottom(0.0), fGBottom(0.0), fBBottom(0.0);
-
-if(n
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/inc
vcl/inc/vcl/fontmanager.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit aabf70b5c6040ad9b98b2340b7bcdba9c9699f8c Author: Herbert Dürr Date: Mon Apr 15 09:03:38 2013 + include the vector header directly, in stlport<=4 it used to be included indirectly diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 1e504e7..d13e417 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include "vcl/dllapi.h" #include "vcl/helper.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
