autorecovery: commit resolved merge (after rebase to m71)

This commit is contained in:
Frank Schoenheit [fs]
2010-02-04 10:38:39 +01:00
331 changed files with 13242 additions and 2436 deletions

View File

@@ -83,6 +83,16 @@ namespace cppcanvas
return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha);
}
inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
{
return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
}
inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
{
return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
}
}
#endif /* _CPPCANVAS_COLOR_HXX */