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

CWS-TOOLING: integrate CWS cmcfixes61

Browse Source 
2009-07-22 10:53:14 +0200 cmc  r274224 : #i103714# duplicate patch
2009-07-22 10:45:26 +0200 cmc  r274223 : #i103715# fix up m68k makefile.mk
2009-07-22 10:32:16 +0200 cmc  r274222 : #i103714# || && new gcc warnings
2009-07-21 13:29:17 +0200 cmc  r274190 : #i103651# fix for subpixel gray line in cairo canvas animations
2009-07-20 17:35:58 +0200 cmc  r274151 : #i103668# WaE over use of const
2009-07-20 15:53:51 +0200 cmc  r274146 : #i103664# use boost::addressof instead
2009-07-20 15:38:40 +0200 cmc  r274145 : #i103451# long -> INT32 for these streamable values
2009-07-20 15:33:15 +0200 cmc  r274144 : #i103663 clear low-hanging aliasing warnings
2009-07-20 15:28:23 +0200 cmc  r274143 : #i103662 clear low-hanging aliasing warnings
2009-07-20 15:21:46 +0200 cmc  r274142 : #i103661 clear low-hanging aliasing warnings
2009-07-20 15:16:05 +0200 cmc  r274141 : #i103660 clear low-hanging aliasing warnings
This commit is contained in:
Jens-Heiner Rechtien
2009-07-29 15:33:56 +00:00
parent 24365b5de8
commit b1afe0f67d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/cairo/cairo_canvashelper.cxx
View File

@@ -888,7 +888,7 @@ namespace cairocanvas
nY = aP.getY(); nY = aP.getY();
cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY ); cairo_matrix_transform_point( &aOrigMatrix, &nX, &nY );
if( ! bIsBezier && bIsRectangle ) { if( ! bIsBezier && (bIsRectangle || aOperation == Clip) ) {
nX = basegfx::fround( nX ); nX = basegfx::fround( nX );
nY = basegfx::fround( nY ); nY = basegfx::fround( nY );
} }

4
svtools/source/control/scrwin.cxx
View File

@@ -273,8 +273,8 @@ void __EXPORT ScrollableWindow::Resize()
// disable painting in the corner between the scrollbars // disable painting in the corner between the scrollbars
if ( bVVisible && bHVisible ) if ( bVVisible && bHVisible )
{ {
aCornerWin.SetPosSizePixel( aCornerWin.SetPosSizePixel(Point(aOutPixSz.Width(), aOutPixSz.Height()),
*((Point*) &aOutPixSz), Size(nScrSize, nScrSize) ); Size(nScrSize, nScrSize) );
aCornerWin.Show(); aCornerWin.Show();
} }
else else

24
vcl/source/glyphs/gcach_ftyp.cxx
View File

@@ -1058,7 +1058,7 @@ static inline void SplitGlyphFlags( const FreetypeServerFont& rFont, int& nGlyph
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
int FreetypeServerFont::ApplyGlyphTransform( int nGlyphFlags, int FreetypeServerFont::ApplyGlyphTransform( int nGlyphFlags,
FT_GlyphRec_* pGlyphFT, bool bForBitmapProcessing ) const FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
{ {
int nAngle = GetFontSelData().mnOrientation; int nAngle = GetFontSelData().mnOrientation;
// shortcut most common case // shortcut most common case
@@ -1130,9 +1130,9 @@ int FreetypeServerFont::ApplyGlyphTransform( int nGlyphFlags,
else else
{ {
// FT<=2005 ignores transforms for bitmaps, so do it manually // FT<=2005 ignores transforms for bitmaps, so do it manually
FT_BitmapGlyph& rBmpGlyphFT = reinterpret_cast<FT_BitmapGlyph&>(pGlyphFT); FT_BitmapGlyph pBmpGlyphFT = reinterpret_cast<FT_BitmapGlyph>(pGlyphFT);
rBmpGlyphFT->left += (aVector.x + 32) >> 6; pBmpGlyphFT->left += (aVector.x + 32) >> 6;
rBmpGlyphFT->top += (aVector.y + 32) >> 6; pBmpGlyphFT->top += (aVector.y + 32) >> 6;
} }
return nAngle; return nAngle;
@@ -1440,12 +1440,12 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap
} }
} }
const FT_BitmapGlyph& rBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph&>(pGlyphFT); const FT_BitmapGlyph pBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph>(pGlyphFT);
// NOTE: autohinting in FT<=2.0.2 miscalculates the offsets below by +-1 // NOTE: autohinting in FT<=2.0.2 miscalculates the offsets below by +-1
rRawBitmap.mnXOffset = +rBmpGlyphFT->left; rRawBitmap.mnXOffset = +pBmpGlyphFT->left;
rRawBitmap.mnYOffset = -rBmpGlyphFT->top; rRawBitmap.mnYOffset = -pBmpGlyphFT->top;
const FT_Bitmap& rBitmapFT = rBmpGlyphFT->bitmap; const FT_Bitmap& rBitmapFT = pBmpGlyphFT->bitmap;
rRawBitmap.mnHeight = rBitmapFT.rows; rRawBitmap.mnHeight = rBitmapFT.rows;
rRawBitmap.mnBitCount = 1; rRawBitmap.mnBitCount = 1;
if( mbArtBold && !pFTEmbolden ) if( mbArtBold && !pFTEmbolden )
@@ -1595,11 +1595,11 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap
} }
} }
const FT_BitmapGlyph& rBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph&>(pGlyphFT); const FT_BitmapGlyph pBmpGlyphFT = reinterpret_cast<const FT_BitmapGlyph>(pGlyphFT);
rRawBitmap.mnXOffset = +rBmpGlyphFT->left; rRawBitmap.mnXOffset = +pBmpGlyphFT->left;
rRawBitmap.mnYOffset = -rBmpGlyphFT->top; rRawBitmap.mnYOffset = -pBmpGlyphFT->top;
const FT_Bitmap& rBitmapFT = rBmpGlyphFT->bitmap; const FT_Bitmap& rBitmapFT = pBmpGlyphFT->bitmap;
rRawBitmap.mnHeight = rBitmapFT.rows; rRawBitmap.mnHeight = rBitmapFT.rows;
rRawBitmap.mnWidth = rBitmapFT.width; rRawBitmap.mnWidth = rBitmapFT.width;
rRawBitmap.mnBitCount = 8; rRawBitmap.mnBitCount = 8;