[Libreoffice-commits] .: canvas/source unusedcode.easy
canvas/source/cairo/cairo_textlayout.cxx |9 -
canvas/source/cairo/cairo_textlayout.hxx |1 -
unusedcode.easy |1 -
3 files changed, 11 deletions(-)
New commits:
commit 6086949c9e29339d097585137e571aa780c24257
Author: Julien Nabet
Date: Sun Jan 13 22:12:45 2013 +0100
Remove unused function useFont
Change-Id: Icaa3e130ebd4eb168a62a2b45cf8f7a222c0764e
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index c5bb947..fe55665 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -301,15 +301,6 @@ namespace cairocanvas
return maText;
}
-void TextLayout::useFont( Cairo* pCairo )
-{
-rendering::FontRequest aFontRequest = mpFont->getFontRequest();
-rendering::FontInfo aFontInfo = aFontRequest.FontDescription;
-
-cairo_select_font_face( pCairo, OUStringToOString(
aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ).getStr(),
CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
-cairo_set_font_size( pCairo, aFontRequest.CellSize );
-}
-
/**
* TextLayout::isCairoRenderable
*
diff --git a/canvas/source/cairo/cairo_textlayout.hxx
b/canvas/source/cairo/cairo_textlayout.hxx
index 42cc369..406b673 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -102,7 +102,6 @@ namespace cairocanvas
SurfaceProviderRef mpRefDevice;
sal_Int8 mnTextDirection;
-void useFont( ::cairo::Cairo* pCairo );
bool isCairoRenderable(SystemFontData aSysFontData) const;
};
diff --git a/unusedcode.easy b/unusedcode.easy
index b860adc..bb03e1e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -30,7 +30,6 @@ apitest::XPropertySet::testAddVetoableChangeListener()
apitest::XPropertySet::testRemovePropertyChangeListener()
apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XSpreadsheetDocument::testGetSheets()
-cairocanvas::TextLayout::useFont(_cairo*)
canvas::createSurfaceProxyManager(boost::shared_ptr
const&)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr
const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/factory/cf_service.cxx| 39 +-
canvas/source/null/null_canvasbitmap.cxx| 12
canvas/source/null/null_canvascustomsprite.cxx | 12
canvas/source/null/null_canvasfont.cxx | 12
canvas/source/null/null_spritecanvas.cxx|4
canvas/source/null/null_textlayout.cxx | 12
canvas/source/simplecanvas/simplecanvasimpl.cxx |2
canvas/source/tools/cachedprimitivebase.cxx | 10
canvas/source/tools/canvastools.cxx |3
canvas/source/tools/parametricpolypolygon.cxx | 20 -
canvas/source/tools/propertysethelper.cxx | 14 -
canvas/source/tools/verifyinput.cxx | 330 ++--
12 files changed, 210 insertions(+), 260 deletions(-)
New commits:
commit 0968c304371a9e49d79f89e99c4ca4bf66f7b649
Author: Chr. Rossmanith
Date: Tue Jan 8 22:21:18 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in canvas
::rtl:: prefix removed from OUString as well
Change-Id: I4de29a9c487ff2b87fdb5efa8e75aaf5b88402b0
diff --git a/canvas/source/factory/cf_service.cxx
b/canvas/source/factory/cf_service.cxx
index b725c95..54459ec 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -39,23 +39,22 @@
#include
#include
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
+
namespace
{
OUString SAL_CALL getImplName()
{
-return OUSTR("com.sun.star.comp.rendering.CanvasFactory");
+return OUString("com.sun.star.comp.rendering.CanvasFactory");
}
Sequence SAL_CALL getSuppServices()
{
-OUString name = OUSTR("com.sun.star.rendering.CanvasFactory");
+OUString name("com.sun.star.rendering.CanvasFactory");
return Sequence(&name, 1);
}
@@ -145,25 +144,25 @@ CanvasFactory::CanvasFactory(
Reference const & xContext ) :
Any propValue(
makeAny( beans::PropertyValue(
- OUSTR("nodepath"), -1,
- makeAny( OUSTR("/org.openoffice.Office.Canvas") ),
+ OUString("nodepath"), -1,
+ makeAny( OUString("/org.openoffice.Office.Canvas") ),
beans::PropertyState_DIRECT_VALUE ) ) );
m_xCanvasConfigNameAccess.set(
xConfigProvider->createInstanceWithArguments(
-OUSTR("com.sun.star.configuration.ConfigurationAccess"),
+OUString("com.sun.star.configuration.ConfigurationAccess"),
Sequence( &propValue, 1 ) ),
UNO_QUERY_THROW );
propValue = makeAny(
beans::PropertyValue(
-OUSTR("nodepath"), -1,
-makeAny(
OUSTR("/org.openoffice.Office.Canvas/CanvasServiceList") ),
+OUString("nodepath"), -1,
+makeAny(
OUString("/org.openoffice.Office.Canvas/CanvasServiceList") ),
beans::PropertyState_DIRECT_VALUE ) );
Reference xNameAccess(
xConfigProvider->createInstanceWithArguments(
-OUSTR("com.sun.star.configuration.ConfigurationAccess"),
+OUString("com.sun.star.configuration.ConfigurationAccess"),
Sequence( &propValue, 1 ) ), UNO_QUERY_THROW );
Reference xHierarchicalNameAccess(
xNameAccess, UNO_QUERY_THROW);
@@ -180,11 +179,11 @@ CanvasFactory::CanvasFactory(
Reference const & xContext ) :
if( xEntryNameAccess.is() )
{
Sequence implementationList;
-if( (xEntryNameAccess->getByName(
OUSTR("PreferredImplementations") ) >>= implementationList) )
+if( (xEntryNameAccess->getByName(
OUString("PreferredImplementations") ) >>= implementationList) )
m_aAvailableImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
-if( (xEntryNameAccess->getByName(
OUSTR("AcceleratedImplementations") ) >>= implementationList) )
+if( (xEntryNameAccess->getByName(
OUString("AcceleratedImplementations") ) >>= implementationList) )
m_aAcceleratedImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
-if( (xEntryNameAccess->getByName(
OUSTR("AntialiasingImplementations") ) >>= implementationList) )
+if( (xEntryNameAccess->getByName(
OUString("AntialiasingImplementations") ) >>= implementationList) )
m_aAAImplementations.push_back(
std::make_pair(*pCurr,implementationList) );
}
@@ -204,12 +203,12 @@ CanvasFactory::CanvasFactory(
Reference const & xContext ) :
// Ugh. Looks like configuration is borked. Fake minimal
// setup.
Sequence aServices(1);
-aServices[0] = OUSTR("com.sun.star.comp.rendering.Canvas.VCL");
-m_aAvailableImplementations.pu
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvas.hxx|2 +-
canvas/source/cairo/cairo_canvashelper_text.cxx |2 +-
canvas/source/cairo/cairo_devicehelper.cxx |6 +++---
canvas/source/cairo/cairo_spritecanvas.cxx |8 +++-
canvas/source/cairo/cairo_spritecanvas.hxx |2 +-
canvas/source/cairo/cairo_textlayout.cxx| 24
canvas/source/cairo/cairo_textlayout.hxx|6 +++---
7 files changed, 24 insertions(+), 26 deletions(-)
New commits:
commit ad2eedc8eb9d2a6f2dd22a66290acbd0e755a73e
Author: Ricardo Montania
Date: Tue Nov 27 13:53:06 2012 -0200
::rtl prefix removal in canvas
Change-Id: Iab6aaa9f06dfe69c85db5e87f9512db0eb44caa8
Reviewed-on: https://gerrit.libreoffice.org/1181
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/canvas/source/cairo/cairo_canvas.hxx
b/canvas/source/cairo/cairo_canvas.hxx
index 5272b18..12bf426 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -124,7 +124,7 @@ namespace cairocanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base,
::cppu::WeakComponentImplHelperBase );
// XServiceName
-virtual ::rtl::OUString SAL_CALL getServiceName( ) throw
(::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getServiceName( ) throw
(::com::sun::star::uno::RuntimeException);
// RepaintTarget
virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface,
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx
b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 3b61810..d65f2de 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -330,7 +330,7 @@ namespace cairocanvas
// TODO(F2): alpha
mpVirtualDevice->SetLayoutMode( nLayoutMode );
-OSL_TRACE(":cairocanvas::CanvasHelper::drawText(O,t,f,v,r,d): %s",
::rtl::OUStringToOString( text.Text.copy( text.StartPosition, text.Length ),
+OSL_TRACE(":cairocanvas::CanvasHelper::drawText(O,t,f,v,r,d): %s",
OUStringToOString( text.Text.copy( text.StartPosition, text.Length ),
RTL_TEXTENCODING_UTF8 ).getStr());
TextLayout* pTextLayout = new TextLayout(text, textDirection, 0,
CanvasFont::Reference(dynamic_cast< CanvasFont* >( xFont.get() )),
mpSurfaceProvider);
diff --git a/canvas/source/cairo/cairo_devicehelper.cxx
b/canvas/source/cairo/cairo_devicehelper.cxx
index 9a674ca..057f913 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -252,9 +252,9 @@ namespace cairocanvas
if( mpRefDevice )
{
-rtl::OUString aFilename("dbg_frontbuffer");
-aFilename += rtl::OUString::valueOf(nFilePostfixCount);
-aFilename += rtl::OUString(".bmp");
+OUString aFilename("dbg_frontbuffer");
+aFilename += OUString::valueOf(nFilePostfixCount);
+aFilename += OUString(".bmp");
SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx
b/canvas/source/cairo/cairo_spritecanvas.cxx
index 6ec0291..6ec9ecd 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -83,9 +83,7 @@ namespace cairocanvas
Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Parent window not VCL window, or canvas
out-of-process!")),
-NULL);
+"Parent window not VCL window, or canvas out-of-process!",
NULL);
bool bHasXRender = IsCairoWorking(pParentWindow);
ENSURE_ARG_OR_THROW( bHasXRender == true,
@@ -146,9 +144,9 @@ namespace cairocanvas
mbSurfaceDirty);
}
-::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw
(uno::RuntimeException)
+OUString SAL_CALL SpriteCanvas::getServiceName( ) throw
(uno::RuntimeException)
{
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
SPRITECANVAS_SERVICE_NAME ) );
+return OUString( SPRITECANVAS_SERVICE_NAME );
}
SurfaceSharedPtr SpriteCanvas::getSurface()
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx
b/canvas/source/cairo/cairo_spritecanvas.hxx
index 6cb3546..1c2a6aa 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -130,7 +130,7 @@ namespace cairocanvas
virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw
(::com::sun::star::uno::RuntimeException);
// XServiceName
-virtual ::r
[Libreoffice-commits] .: canvas/source
canvas/source/tools/canvastools.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5124b6d83ec6e7755fa96315fb522b9e8f05e652 Author: Stephan Bergmann Date: Thu Nov 22 17:36:38 2012 +0100 warning C4309: '=' : truncation of constant value Change-Id: I18bc0505870181fe2c667e3281ed5a90abeac476 diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index 25977f6..751848c 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -850,7 +850,7 @@ namespace canvas *pColors++ = vcl::unotools::toByteColor(pIn->Red); *pColors++ = vcl::unotools::toByteColor(pIn->Green); *pColors++ = vcl::unotools::toByteColor(pIn->Blue); -*pColors++ = 255; +*pColors++ = -1; ++pIn; } return aRes; @@ -868,7 +868,7 @@ namespace canvas *pColors++ = vcl::unotools::toByteColor(pIn->Red/pIn->Alpha); *pColors++ = vcl::unotools::toByteColor(pIn->Green/pIn->Alpha); *pColors++ = vcl::unotools::toByteColor(pIn->Blue/pIn->Alpha); -*pColors++ = 255; +*pColors++ = -1; ++pIn; } return aRes; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c1282c1fa0d1724f88538f75229f1f5a8d177ab Author: Andras Timar Date: Tue Nov 20 22:19:24 2012 +0100 fix typo Change-Id: Ic5c3c2d9cb2ad4186aad7bd16693c972d4a257f3 diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 2fe6091..a73cda2 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -39,7 +39,7 @@ #include #include "dx_impltools.hxx" #include -#include +#include #include "dx_textlayout_drawhelper.hxx" #include "dx_bitmap.hxx" #include "dx_canvasfont.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ee6bfe1910b6b3a255f3e393689397fc2c94cdda Author: Eike Rathke Date: Tue Nov 20 17:26:09 2012 +0100 use LanguageTag Change-Id: Ic81a3f3ffd00431ddc8082a210dacaa77ce862f4 diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index b4f2104..2fe6091 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -39,7 +39,7 @@ #include #include "dx_impltools.hxx" #include -#include +#include #include "dx_textlayout_drawhelper.hxx" #include "dx_bitmap.hxx" #include "dx_canvasfont.hxx" @@ -125,7 +125,7 @@ namespace dxcanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); + aFont.SetLanguage(LanguageTag(rFontRequest.Locale).getLanguageType()); // setup font color aFont.SetColor( aColor ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvasfont.cxx |4 ++-- canvas/source/vcl/canvasfont.cxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8efe5ff8a0fcaa01cafbb156e9b20dc34c4c97d4 Author: Eike Rathke Date: Sat Nov 17 00:11:48 2012 +0100 use LanguageTag Change-Id: I7277f40dcba1e079ede32a01f526342a5cde435b diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 44be8b3..0e8e58f 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include "cairo_canvasfont.hxx" #include "cairo_textlayout.hxx" @@ -57,7 +57,7 @@ namespace cairocanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); +maFont->SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 4981182..12fe309 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -59,7 +59,7 @@ namespace vclcanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); +maFont->SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx | 10 -
canvas/source/cairo/cairo_canvashelper.hxx |5
canvas/source/cairo/cairo_spritedevicehelper.cxx |5
canvas/source/cairo/cairo_spritedevicehelper.hxx |1
canvas/source/cairo/cairo_textlayout.cxx | 24 ---
canvas/source/cairo/cairo_textlayout.hxx |1
6 files changed, 46 deletions(-)
New commits:
commit ea7a809700ea0ee6d830e493c57ff272364e344a
Author: José Guilherme Vanz
Date: Sat Nov 10 02:41:41 2012 -0200
unusedcode.ease cleanup
This commit removes some unused code from unusedcode.easy
Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775
Signed-off-by: José Guilherme Vanz
Reviewed-on: https://gerrit.libreoffice.org/1021
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 8c0f03e..f18d2dc 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1626,12 +1626,6 @@ namespace cairocanvas
return uno::Sequence< sal_Int8 >();
}
-uno::Reference< rendering::XBitmapPalette > CanvasHelper::getPalette()
-{
-// TODO(F1): Palette bitmaps NYI
-return uno::Reference< rendering::XBitmapPalette >();
-}
-
namespace
{
class CairoColorSpace : public cppu::WeakImplHelper1<
com::sun::star::rendering::XIntegerBitmapColorSpace >
@@ -2020,10 +2014,6 @@ namespace cairocanvas
return aLayout;
}
-void CanvasHelper::flush() const
-{
-}
-
bool CanvasHelper::hasAlpha() const
{
return mbHaveAlpha;
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx
b/canvas/source/cairo/cairo_canvashelper.hxx
index c16edf3..3ae1de7 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -244,13 +244,8 @@ namespace cairocanvas
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout&
bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
-::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapPalette > getPalette();
-
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
-// Flush drawing queue to screen
-voidflush() const;
-
/** Called from XCanvas base classes, to notify that content
is _about_ to change
*/
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx
b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index caf867c..4657717 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -144,11 +144,6 @@ namespace cairocanvas
setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) );
}
-SurfaceSharedPtr SpriteDeviceHelper::getSurface()
-{
-return mpBufferSurface;
-}
-
SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface()
{
return mpBufferSurface;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx
b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 7236400..01672e7 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -64,7 +64,6 @@ namespace cairocanvas
void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds
);
void setSize( const ::basegfx::B2ISize& rSize );
-::cairo::SurfaceSharedPtr getSurface();
::cairo::SurfaceSharedPtr getBufferSurface();
::cairo::SurfaceSharedPtr getWindowSurface();
::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize&
rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA );
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 317ea26..66b0f40 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -310,30 +310,6 @@ namespace cairocanvas
cairo_set_font_size( pCairo, aFontRequest.CellSize );
}
- /** TextLayout:draw
- *
- * This function uses the "toy" api of the cairo library
- *
- **/
-bool TextLayout::draw( Cairo* pCairo )
-{
-::osl::MutexGuard aGuard( m_aMutex );
-
-::rtl::OUString aSubText = maText.Text.copy( maText.StartPosition,
maText.Length );
-::rtl::OString aUTF8String = ::rtl::OUStringToOString( aSubText,
RTL_TEXTENCODING_UTF8 );
-
-cairo_save( pCairo );
-/* move to 0, 0 as cairo_show_text advances current point and current
point is not restored by cairo_restore.
- before we were depending on unmodified current point which I
believed was preserved by save/restore */
-cairo_move_to( pCairo, 0, 0 );
-useFont( pCairo );
-cairo_show_text( pC
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 638f6cb6a666aa611d3e0bef5a29e5824b0574ee
Author: Jan Holesovsky
Date: Fri Nov 9 11:38:11 2012 +0100
bnc#681110: Fix squashed glyphs with Cairo canvas.
I suppose it is the same misconception as in fdo#55931 - I am convinced that
the font metrics should not be used here.
Looks to me as if in the past, the font width computation was broken
somewhere
deep inside OOo, and everyone instead of fixing the root cause was just
working that around by using the FontMetric; and then one day the root cause
was fixed, and all the workarounds broke ;-) - but that is just a theory.
Change-Id: I741bf8f4eaea4f7d8bc698dc9a8124109dfb8c20
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 6fa5562..317ea26 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -545,32 +545,13 @@ namespace cairocanvas
// Font rotation and scaling
cairo_matrix_t m;
Font aFont = rOutDev.GetFont();
-FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
-long nWidth = 0;
-
-// width calculation is deep magic and platform/font dependant.
-// width == 0 means no scaling, and usually width == height means
the same.
-// Other values mean horizontal scaling (narrow or stretching)
-// see issue #101566
-
-//proper scale calculation across platforms
-if (aFont.GetWidth() == 0)
-{
-nWidth = aFont.GetHeight();
-}
-else
-{
-// any scaling needs to be relative to the platform-dependent
definition
-// of height of the font
-nWidth = aFont.GetWidth() * aFont.GetHeight() /
aMetric.GetHeight();
-}
cairo_matrix_init_identity(&m);
if (aSysLayoutData.orientation)
cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) *
M_PI / 1800.0);
-cairo_matrix_scale(&m, nWidth, aFont.GetHeight());
+cairo_matrix_scale(&m, aFont.GetWidth(), aFont.GetHeight());
//faux italics
if (rSysFontData.bFakeItalic)
@@ -583,11 +564,9 @@ namespace cairocanvas
#else
# define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(),
RTL_TEXTENCODING_UTF8 ).getStr()
#endif
-OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
+OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r):
Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
aFont.GetWidth(),
aFont.GetHeight(),
- aMetric.GetWidth(),
- nWidth,
(int) rOutpos.X(),
(int) rOutpos.Y(),
cairo_glyphs.size() > 0 ? cairo_glyphs[0].index : -1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 0c120f9dd429e035c1e4595c702411241c4431ea
Author: Michael Stahl
Date: Mon Oct 15 15:47:09 2012 +0200
cairo canvas: handle 8-bit grey-scale alpha colors:
Apparently BitmapReadAccess::ImplCreate creates non-indexed color
palettes in case of grey-scale, which leads to one assertion from
BitmapColor::GetIndex() per pixel if that is accessed incorrectly;
handle this better in cairo canvas.
Change-Id: Idcdc3fbe182db948d25e744cb484e2db932c7868
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 0ecddee..8c0f03e 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -339,6 +339,22 @@ namespace cairocanvas
return ::BitmapEx();
}
+static sal_uInt8 lcl_GetColor(BitmapColor const& rColor)
+{
+sal_uInt8 nTemp(0);
+if (rColor.IsIndex())
+{
+nTemp = rColor.GetIndex();
+}
+else
+{
+nTemp = rColor.GetBlue();
+// greyscale expected here, or what would non-grey colors mean?
+assert(rColor.GetRed() == nTemp && rColor.GetGreen() == nTemp);
+}
+return nTemp;
+}
+
static bool readAlpha( BitmapReadAccess* pAlphaReadAcc, long nY, const
long nWidth, unsigned char* data, long nOff )
{
bool bIsAlpha = false;
@@ -364,7 +380,10 @@ namespace cairocanvas
pReadScan = pAlphaReadAcc->GetScanline( nY );
for( nX = 0; nX < nWidth; nX++ )
{
-nAlpha = data[ nOff ] = 255 - (
pAlphaReadAcc->GetPaletteColor( *pReadScan++ ).GetIndex() );
+BitmapColor const& rColor(
+pAlphaReadAcc->GetPaletteColor(*pReadScan));
+pReadScan++;
+nAlpha = data[ nOff ] = 255 - lcl_GetColor(rColor);
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/vcl/canvashelper.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3d70fe990dbf977aebf4042e846f2ca173e5b43e
Author: Tor Lillqvist
Date: Mon Oct 8 13:43:22 2012 +0300
WaE: unused function 'unoCapeFromCap'
Change-Id: I21dc33e39da8f46379fad672a83e8fb8449a0ec4
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 8028a91..0d4f204 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -90,6 +90,7 @@ namespace vclcanvas
return basegfx::B2DLINEJOIN_NONE;
}
+#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
drawing::LineCap unoCapeFromCap( sal_Int8 nCapType)
{
switch ( nCapType)
@@ -109,6 +110,7 @@ namespace vclcanvas
}
return drawing::LineCap_BUTT;
}
+#endif
}
CanvasHelper::CanvasHelper() :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit b65b4160bfae737d3bc435f23d551bef65e02f81
Author: Radek Doulik
Date: Mon Aug 20 12:54:37 2012 +0200
fill whole polypolygon at once, so that fill rule is applied correctly
- fixes rest of n#759172
Change-Id: I6c2694bf8276337b7d1fa54a12867bfc2b658a23
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 924e6f8..a7cf165 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1045,12 +1045,6 @@ namespace cairocanvas
if( aPolygon.isClosed() )
cairo_close_path( pCairo );
-if( aOperation == Fill && pTextures )
-{
-cairo_set_matrix( pCairo, &aOrigMatrix );
-doOperation( aOperation, pCairo, pTextures, pDevice,
aPolyPolygon.getB2DRange() );
-cairo_set_matrix( pCairo, &aIdentityMatrix );
-}
}
else
{
@@ -1063,6 +1057,14 @@ namespace cairocanvas
}
}
}
+
+if( aOperation == Fill && pTextures )
+{
+cairo_set_matrix( pCairo, &aOrigMatrix );
+doOperation( aOperation, pCairo, pTextures, pDevice,
aPolyPolygon.getB2DRange() );
+cairo_set_matrix( pCairo, &aIdentityMatrix );
+}
+
if( bOpToDo && ( aOperation != Fill || !pTextures ) )
doOperation( aOperation, pCairo, pTextures, pDevice,
aPolyPolygon.getB2DRange() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/vcl/canvashelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5cfd4e920023ecb6caa9061bc0a52ea03def83c6
Author: Julien Nabet
Date: Mon Jul 16 23:09:35 2012 +0200
Reduce scope
Change-Id: Ifbfd8e4b7a549d0225229a60a12b1b346fc02828
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index fde6ebe..8b025e0 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -483,7 +483,6 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
const int nTransparency( setupOutDevState( viewState, renderState,
FILL_COLOR ) );
-const int nTransPercent( (nTransparency * 100 + 128) / 255 ); //
normal rounding, no truncation here
::basegfx::B2DPolyPolygon aB2DPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL
does not fill
@@ -497,6 +496,7 @@ namespace vclcanvas
}
else
{
+const int nTransPercent( (nTransparency * 100 + 128) / 255 );
// normal rounding, no truncation here
mpOutDev->getOutDev().DrawTransparent( aPolyPoly,
(sal_uInt16)nTransPercent );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source sal/inc sc/source
canvas/source/directx/dx_surfacebitmap.cxx | 14 +++---
sal/inc/osl/file.hxx |4 ++--
sc/source/filter/qpro/qprostyle.cxx|8
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 3396c06c55ad5d5345aabfcf7efc6747f9a6
Author: Christophe JAILLET
Date: Tue Jul 10 22:00:22 2012 +0200
Use rtl_zeroMemory in place of rtl_fillMemory(..., 0)
Change-Id: Idd83f6340d13a1d7111d0d5a7268f1aa8bf5c09e
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index d0ca06d..413c17e 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -83,7 +83,7 @@ namespace dxcanvas
sal_uInt8* DXColorBuffer::lock() const
{
#if DIRECTX_VERSION < 0x0900
-rtl_fillMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory((void *)&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
if(SUCCEEDED(mpSurface->Lock(NULL,&aSurfaceDesc,dwFlags,NULL)))
@@ -344,7 +344,7 @@ namespace dxcanvas
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
@@ -468,7 +468,7 @@ namespace dxcanvas
{
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC),0 );
+rtl_zeroMemory( &aSurfaceDesc,sizeof(DDSURFACEDESC) );
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
if( FAILED(mpSurface->Lock( NULL,
@@ -541,7 +541,7 @@ namespace dxcanvas
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
@@ -623,7 +623,7 @@ namespace dxcanvas
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY;
@@ -703,7 +703,7 @@ namespace dxcanvas
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY;
@@ -761,7 +761,7 @@ namespace dxcanvas
#if DIRECTX_VERSION < 0x0900
DDSURFACEDESC aSurfaceDesc;
-rtl_fillMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC),0);
+rtl_zeroMemory(&aSurfaceDesc,sizeof(DDSURFACEDESC));
aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 16f7a06..e93682d 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -444,7 +444,7 @@ public:
VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
{
_aInfo.uStructSize = sizeof( oslVolumeInfo );
-rtl_fillMemory( &_aInfo.uValidFields, sizeof( oslVolumeInfo ) -
sizeof( sal_uInt32 ), 0 );
+rtl_zeroMemory( &_aInfo.uValidFields, sizeof( oslVolumeInfo ) -
sizeof( sal_uInt32 ) );
_aInfo.pDeviceHandle = &_aDevice._aHandle;
}
@@ -692,7 +692,7 @@ public:
FileStatus( sal_uInt32 nMask ): _nMask( nMask )
{
_aStatus.uStructSize = sizeof( oslFileStatus );
-rtl_fillMemory( &_aStatus.uValidFields, sizeof( oslFileStatus ) -
sizeof( sal_uInt32 ), 0 );
+rtl_zeroMemory( &_aStatus.uValidFields, sizeof( oslFileStatus ) -
sizeof( sal_uInt32 ) );
}
/** Destructor.
diff --git a/sc/source/filter/qpro/qprostyle.cxx
b/sc/source/filter/qpro/qprostyle.cxx
index f3556d6..9284bb2 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -55,10 +55,10 @@
ScQProStyle::ScQProStyle()
{
-rtl_fillMemory (maAlign, sizeof (maAlign), 0);
-rtl_fillMemory (maFont, sizeof (maFont), 0);
-rtl_fillMemory (maFontRecord, sizeof (maFontRecord), 0);
-rtl_fillMemory (maFontHeight, sizeof
[Libreoffice-commits] .: canvas/source
canvas/source/vcl/canvashelper.cxx |4 ++--
canvas/source/vcl/canvashelper_texturefill.cxx |2 +-
canvas/source/vcl/impltools.cxx| 14 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit b95cfee03ca6eb63eb94593ced389c7f442f2d69
Author: Michael Meeks
Date: Wed Jul 4 16:08:13 2012 +0100
fix fdo#51547: revert "Some cppcheck cleaning"
This reverts commit 2f804c94cdaaa9ac047f229509c774dbea1dbcaa.
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 7dc4751..fde6ebe 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -483,6 +483,7 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
const int nTransparency( setupOutDevState( viewState, renderState,
FILL_COLOR ) );
+const int nTransPercent( (nTransparency * 100 + 128) / 255 ); //
normal rounding, no truncation here
::basegfx::B2DPolyPolygon aB2DPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL
does not fill
@@ -496,8 +497,7 @@ namespace vclcanvas
}
else
{
-const sal_uInt16 nTransPercent( (nTransparency * 100 + 128) /
255 ); // normal rounding, no truncation here
-mpOutDev->getOutDev().DrawTransparent( aPolyPoly,
nTransPercent );
+mpOutDev->getOutDev().DrawTransparent( aPolyPoly,
(sal_uInt16)nTransPercent );
}
if( mp2ndOutDev )
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index df293a5..1021d33 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -683,6 +683,7 @@ namespace vclcanvas
{
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
+const int nTransparency( setupOutDevState( viewState, renderState,
IGNORE_COLOR ) );
PolyPolygon aPolyPoly( tools::mapPolyPolygon(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon),
viewState, renderState ) );
@@ -710,7 +711,6 @@ namespace vclcanvas
}
else
{
-const int nTransparency( setupOutDevState( viewState,
renderState, IGNORE_COLOR ) );
std::vector< ::Color >
aColors(rValues.maColors.getLength());
std::transform(&rValues.maColors[0],
&rValues.maColors[0]+rValues.maColors.getLength(),
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 09e20b4..0484d1e 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -245,6 +245,13 @@ namespace vclcanvas
aSrcRect,
rTransform );
+const bool bModulateColors( eModulationMode ==
MODULATE_WITH_DEVICECOLOR &&
+rDeviceColor.getLength() > 2 );
+const double nRedModulation( bModulateColors ? rDeviceColor[0] :
1.0 );
+const double nGreenModulation( bModulateColors ? rDeviceColor[1] :
1.0 );
+const double nBlueModulation( bModulateColors ? rDeviceColor[2] :
1.0 );
+const double nAlphaModulation( bModulateColors &&
rDeviceColor.getLength() > 3 ?
+ rDeviceColor[3] : 1.0 );
Bitmap aSrcBitmap( rBitmap.GetBitmap() );
Bitmap aSrcAlpha;
@@ -329,13 +336,6 @@ namespace vclcanvas
::basegfx::B2DHomMatrix aTransform( aLocalTransform );
aTransform.invert();
-const bool bModulateColors( eModulationMode ==
MODULATE_WITH_DEVICECOLOR &&
-rDeviceColor.getLength() > 2 );
-const double nRedModulation( bModulateColors ?
rDeviceColor[0] : 1.0 );
-const double nGreenModulation( bModulateColors ?
rDeviceColor[1] : 1.0 );
-const double nBlueModulation( bModulateColors ?
rDeviceColor[2] : 1.0 );
-const double nAlphaModulation( bModulateColors &&
rDeviceColor.getLength() > 3 ?
- rDeviceColor[3] : 1.0 );
// for the time being, always read as ARGB
for( int y=0; yhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source cui/source filter/source framework/source sd/source sfx2/source svtools/source svx/source toolkit/source vcl/inc vcl/source
canvas/source/vcl/canvasbitmaphelper.cxx |2 +-
canvas/source/vcl/canvashelper.cxx |2 +-
cui/source/dialogs/cuigrfflt.cxx |2 +-
filter/source/graphicfilter/eps/eps.cxx|2 +-
framework/source/fwe/classes/addonsoptions.cxx |6 +++---
framework/source/uielement/imagebuttontoolbarcontroller.cxx|2 +-
sd/source/ui/dlg/dlgass.cxx|2 +-
sd/source/ui/presenter/SlideRenderer.cxx |2 +-
sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx|2 +-
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx |2 +-
sd/source/ui/tools/PreviewRenderer.cxx |2 +-
sfx2/source/toolbox/tbxitem.cxx|2 +-
svtools/source/graphic/grfmgr2.cxx | 10
--
svx/source/gallery2/galobj.cxx |2 +-
toolkit/source/awt/vclxmenu.cxx|2 +-
vcl/inc/vcl/bitmap.hxx |9 +++--
vcl/inc/vcl/bitmapex.hxx |4 ++--
vcl/source/gdi/bitmapex.cxx|2 +-
vcl/source/gdi/pdfwriter_impl2.cxx |2 +-
vcl/source/helper/canvasbitmap.cxx |2 +-
20 files changed, 32 insertions(+), 29 deletions(-)
New commits:
commit ceb8b18f5b7437ba7438c428c3c78e4d8d67fee3
Author: LuboÅ¡ LuÅák
Date: Fri Jun 22 17:19:12 2012 +0200
use generic names rather than specific algorithm names when scaling
The Lanczos scaling is of very good quality, but it's rather slow,
which can be very noticeable with large images, so it's not a very
good default for everything. And in general, it's not good to refer
to a specific algorithm when all one usually wants is fast/default/best.
Some of these changes are a bit of a guess between default/best,
but the general logic is that best should be used only for images
that won't be large or where the possible waiting does not matter.
Change-Id: I53765507ecb7ed167890f6dd05e73fe53ffd0231
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx
b/canvas/source/vcl/canvasbitmaphelper.cxx
index cceaf7b..e86b629 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
BitmapEx aRes( mpBackBuffer->getBitmapReference() );
aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
- beFast ? BMP_SCALE_FAST : BMP_SCALE_LANCZOS );
+ beFast ? BMP_SCALE_FAST : BMP_SCALE_DEFAULT );
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( aRes, *mpDevice, mpOutDevReference ) );
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index ba36f40..7dc4751 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -927,7 +927,7 @@ namespace vclcanvas
Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) );
aBitmap.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
- beFast ? BMP_SCALE_FAST : BMP_SCALE_LANCZOS );
+ beFast ? BMP_SCALE_FAST : BMP_SCALE_DEFAULT );
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( aBitmap, *mpDevice, mpOutDev ) );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 0b846cb..310c54a 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -133,7 +133,7 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent,
const ResId& rResId,
{
BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
-if( aBmpEx.Scale( aGrfSize, BMP_SCALE_LANCZOS ) )
+if( aBmpEx.Scale( aGrfSize, BMP_SCALE_DEFAULT ) )
maGraphic = aBmpEx;
}
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 4cb6509..8e2c2aa 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -499,7 +499,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
{
Size aSizeBitmap( ( aSizePoint.Width() + 7 ) & ~7, aSizePoint.Height()
);
Bitmap aTmpBitmap( pPreview->GetBitmap() );
-aTmpBitmap.Scale( aSizeBitmap, BMP_SCALE_LANCZOS );
+aTmpBitmap.Scale( aSizeBitmap, BMP_SCALE_BEST );
aTmpBitmap.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
BitmapReadAccess* pAcc = aTmpBitmap.AcquireReadAccess();
if ( pAcc )
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 844f109.
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_cairo.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9d088154b4d18c559e15b535a43cd86fab8325bb
Author: Michael Meeks
Date: Tue Jun 19 18:10:49 2012 +0100
fix comment snafu
diff --git a/canvas/source/cairo/cairo_cairo.cxx
b/canvas/source/cairo/cairo_cairo.cxx
index b9c4028..290235a 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.cxx
@@ -24,6 +24,7 @@
namespace cairo
{
+
/***
* Platform independent part of surface backends for OpenOffice.org Cairo
Canvas*
* For the rest of the functions (and the platform-specific derived
*
* Surface classes), see platform specific cairo__cairo.cxx
*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source io/source l10ntools/source sc/source sd/source svtools/source svx/source vcl/source xmloff/source
canvas/source/directx/dx_textlayout_drawhelper.cxx|1 -
io/source/TextInputStream/TextInputStream.cxx |1 -
io/source/TextOutputStream/TextOutputStream.cxx |1 -
l10ntools/source/help/HelpLinker.cxx | 12
sc/source/ui/docshell/impex.cxx |4
sc/source/ui/view/dbfunc2.cxx |3 ---
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 --
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2 --
sd/source/ui/func/fuconuno.cxx|3 ---
svtools/source/contnr/svtreebx.cxx|2 --
svtools/source/uno/addrtempuno.cxx|4
svx/source/svdraw/svdmrkv.cxx |5 -
svx/source/unodraw/unoshap2.cxx |3 ---
svx/source/unodraw/unoshape.cxx |1 -
vcl/source/app/svapp.cxx |4
xmloff/source/core/PropertySetMerger.cxx |2 --
16 files changed, 50 deletions(-)
New commits:
commit 462935f367534012817efb2478c4f748f0576d5c
Author: Takeshi Abe
Date: Sat Jun 16 22:08:09 2012 +0900
removed unused forward declarations of class
Change-Id: I819d5b931c937ec52b14f60591546d1d86c38631
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 508db17..d012869 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -62,7 +62,6 @@ using namespace ::com::sun::star;
namespace dxcanvas
{
-class DXBitmap;
TextLayoutDrawHelper::TextLayoutDrawHelper(
const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice ) :
mxGraphicDevice(xGraphicDevice)
diff --git a/io/source/TextInputStream/TextInputStream.cxx
b/io/source/TextInputStream/TextInputStream.cxx
index ab68a71..d0c653a 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -64,7 +64,6 @@ namespace io_TextInputStream
// Implementation XTextInputStream
typedef WeakImplHelper3< XTextInputStream, XActiveDataSink, XServiceInfo >
TextInputStreamHelper;
-class OCommandEnvironment;
#define INITIAL_UNICODE_BUFFER_CAPACITY 0x100
#define READ_BYTE_COUNT 0x100
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx
b/io/source/TextOutputStream/TextOutputStream.cxx
index 90f34ab..edeea33 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -62,7 +62,6 @@ namespace io_TextOutputStream
// Implementation XTextOutputStream
typedef WeakImplHelper3< XTextOutputStream, XActiveDataSource, XServiceInfo >
TextOutputStreamHelper;
-class OCommandEnvironment;
class OTextOutputStream : public TextOutputStreamHelper
{
diff --git a/l10ntools/source/help/HelpLinker.cxx
b/l10ntools/source/help/HelpLinker.cxx
index 6d150a8..f61c5cd 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -46,18 +46,6 @@
#include
-namespace lucene
-{
-namespace document
-{
-class Document;
-}
-namespace util
-{
-class Reader;
-}
-}
-
IndexerPreProcessor::IndexerPreProcessor
( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
const fs::path& idxCaptionStylesheet, const fs::path&
idxContentStylesheet )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 73015c3..a0bb6cd 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -26,10 +26,6 @@
*
/
-class StarBASIC;
-
-
-
#include "sc.hrc"
#include
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index ef4b4da..fcd2743 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -43,9 +43,6 @@
//==
-class ScDrawLayer;
-class ScChartCollection;
-
void ScDBFunc::UpdateCharts( sal_Bool bAllCharts )
{
sal_uInt16 nFound = 0;
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 2ca6673..c61a867 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -60,8 +60,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
-class SfxViewFrame;
-
namespace accessibility {
//= internal
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cx
[Libreoffice-commits] .: canvas/source
canvas/source/vcl/canvashelper.cxx |4 ++--
canvas/source/vcl/canvashelper_texturefill.cxx |2 +-
canvas/source/vcl/impltools.cxx| 14 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 2f804c94cdaaa9ac047f229509c774dbea1dbcaa
Author: Julien Nabet
Date: Mon May 28 20:50:07 2012 +0200
Some cppcheck cleaning
Change-Id: Id5be3a25fc66d2f7fcec8325491a23d6908021fc
diff --git a/canvas/source/vcl/canvashelper.cxx
b/canvas/source/vcl/canvashelper.cxx
index 9ae3c8b..83f3ccf 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -483,7 +483,6 @@ namespace vclcanvas
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
const int nTransparency( setupOutDevState( viewState, renderState,
FILL_COLOR ) );
-const int nTransPercent( (nTransparency * 100 + 128) / 255 ); //
normal rounding, no truncation here
::basegfx::B2DPolyPolygon aB2DPolyPoly(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL
does not fill
@@ -497,7 +496,8 @@ namespace vclcanvas
}
else
{
-mpOutDev->getOutDev().DrawTransparent( aPolyPoly,
(sal_uInt16)nTransPercent );
+const sal_uInt16 nTransPercent( (nTransparency * 100 + 128) /
255 ); // normal rounding, no truncation here
+mpOutDev->getOutDev().DrawTransparent( aPolyPoly,
nTransPercent );
}
if( mp2ndOutDev )
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 1021d33..df293a5 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -683,7 +683,6 @@ namespace vclcanvas
{
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
-const int nTransparency( setupOutDevState( viewState, renderState,
IGNORE_COLOR ) );
PolyPolygon aPolyPoly( tools::mapPolyPolygon(
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon),
viewState, renderState ) );
@@ -711,6 +710,7 @@ namespace vclcanvas
}
else
{
+const int nTransparency( setupOutDevState( viewState,
renderState, IGNORE_COLOR ) );
std::vector< ::Color >
aColors(rValues.maColors.getLength());
std::transform(&rValues.maColors[0],
&rValues.maColors[0]+rValues.maColors.getLength(),
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 0484d1e..09e20b4 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -245,13 +245,6 @@ namespace vclcanvas
aSrcRect,
rTransform );
-const bool bModulateColors( eModulationMode ==
MODULATE_WITH_DEVICECOLOR &&
-rDeviceColor.getLength() > 2 );
-const double nRedModulation( bModulateColors ? rDeviceColor[0] :
1.0 );
-const double nGreenModulation( bModulateColors ? rDeviceColor[1] :
1.0 );
-const double nBlueModulation( bModulateColors ? rDeviceColor[2] :
1.0 );
-const double nAlphaModulation( bModulateColors &&
rDeviceColor.getLength() > 3 ?
- rDeviceColor[3] : 1.0 );
Bitmap aSrcBitmap( rBitmap.GetBitmap() );
Bitmap aSrcAlpha;
@@ -336,6 +329,13 @@ namespace vclcanvas
::basegfx::B2DHomMatrix aTransform( aLocalTransform );
aTransform.invert();
+const bool bModulateColors( eModulationMode ==
MODULATE_WITH_DEVICECOLOR &&
+rDeviceColor.getLength() > 2 );
+const double nRedModulation( bModulateColors ?
rDeviceColor[0] : 1.0 );
+const double nGreenModulation( bModulateColors ?
rDeviceColor[1] : 1.0 );
+const double nBlueModulation( bModulateColors ?
rDeviceColor[2] : 1.0 );
+const double nAlphaModulation( bModulateColors &&
rDeviceColor.getLength() > 3 ?
+ rDeviceColor[3] : 1.0 );
// for the time being, always read as ARGB
for( int y=0; yhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source unusedcode.easy
canvas/source/null/null_canvasfont.cxx |5 -
canvas/source/null/null_canvasfont.hxx |2 --
canvas/source/null/null_canvashelper.cxx | 10 --
canvas/source/null/null_canvashelper.hxx |5 -
unusedcode.easy |2 --
5 files changed, 24 deletions(-)
New commits:
commit 0992e5111fcac424e3b0e944a077716428ab4f84
Author: Julien Nabet
Date: Mon Apr 30 19:50:19 2012 +0200
Some removing in cairocanvas
Change-Id: Idd08fd733670f4410349a45de882710b19a31f67
diff --git a/canvas/source/null/null_canvasfont.cxx
b/canvas/source/null/null_canvasfont.cxx
index 8c5cb37..838e925 100644
--- a/canvas/source/null/null_canvasfont.cxx
+++ b/canvas/source/null/null_canvasfont.cxx
@@ -112,11 +112,6 @@ namespace nullcanvas
return aRet;
}
-
-const ::com::sun::star::geometry::Matrix2D& CanvasFont::getFontMatrix()
const
-{
-return maFontMatrix;
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/null/null_canvasfont.hxx
b/canvas/source/null/null_canvasfont.hxx
index 8e3a0f3..0712e2b 100644
--- a/canvas/source/null/null_canvasfont.hxx
+++ b/canvas/source/null/null_canvasfont.hxx
@@ -84,8 +84,6 @@ namespace nullcanvas
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
-const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const;
-
private:
::com::sun::star::rendering::FontRequestmaFontRequest;
::com::sun::star::geometry::Matrix2DmaFontMatrix;
diff --git a/canvas/source/null/null_canvashelper.cxx
b/canvas/source/null/null_canvashelper.cxx
index 40ac91c..75bcc35 100644
--- a/canvas/source/null/null_canvashelper.cxx
+++ b/canvas/source/null/null_canvashelper.cxx
@@ -312,21 +312,11 @@ namespace nullcanvas
return uno::Sequence< sal_Int8 >();
}
-uno::Reference< rendering::XBitmapPalette > CanvasHelper::getPalette()
-{
-// TODO(F1): Palette bitmaps NYI
-return uno::Reference< rendering::XBitmapPalette >();
-}
-
rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout()
{
return ::canvas::tools::getStdMemoryLayout(getSize());
}
-void CanvasHelper::flush() const
-{
-}
-
bool CanvasHelper::hasAlpha() const
{
return mbHaveAlpha;
diff --git a/canvas/source/null/null_canvashelper.hxx
b/canvas/source/null/null_canvashelper.hxx
index 383e47c..a3e8ad5 100644
--- a/canvas/source/null/null_canvashelper.hxx
+++ b/canvas/source/null/null_canvashelper.hxx
@@ -240,13 +240,8 @@ namespace nullcanvas
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout&
bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
-::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapPalette > getPalette();
-
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
-// Flush drawing queue to screen
-voidflush() const;
-
/** Called from XCanvas base classes, to notify that content
is _about_ to change
*/
diff --git a/unusedcode.easy b/unusedcode.easy
index 17feed2..8377f93 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -652,8 +652,6 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&,
unsigned short)
binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned
short, unsigned short)
binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned
char (*)(binfilter::_ZSortFly const&, void*), void*)
-cairocanvas::CanvasHelper::flush() const
-cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
cairocanvas::TextLayout::draw(_cairo*)
canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector::MapEntry,
std::allocator::MapEntry>
> const&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
