Skip to content

C
core
Kaydet (Commit) 9afa6661 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl
Dosyalara gözat
Seçenekler

move Animation, AnimationBitmap out from clang-format blacklist 

Change-Id: I95fd2d4e164bf04c4457b3e20401270227e21a8f
Reviewed-on: https://gerrit.libreoffice.org/71424Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
Tested-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 5c3ae69f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 93 deletions
include/vcl/animate/Animation.hxx
Dosyayı görüntüle @ 9afa6661
...@@ -32,89 +32,73 @@ class VCL_DLLPUBLIC Animation ...@@ -32,89 +32,73 @@ class VCL_DLLPUBLIC Animation
{ {
public: public:
Animation(); Animation();
Animation( const Animation& rAnimation ); Animation(const Animation& rAnimation);
~Animation(); ~Animation();
Animation& operator=( const Animation& rAnimation ); Animation& operator=(const Animation& rAnimation);
bool operator==( const Animation& rAnimation ) const; bool operator==(const Animation& rAnimation) const;
bool operator!=( const Animation& rAnimation ) const bool operator!=(const Animation& rAnimation) const { return !(*this == rAnimation); }
{ return !(*this==rAnimation); }
void Clear(); void Clear();
bool Start( bool Start(OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData,
OutputDevice* pOutDev,
const Point& rDestPt,
const Size& rDestSz,
long nExtraData,
OutputDevice* pFirstFrameOutDev); OutputDevice* pFirstFrameOutDev);
void Stop( OutputDevice* pOutDev = nullptr, long nExtraData = 0 ); void Stop(OutputDevice* pOutDev = nullptr, long nExtraData = 0);
void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; void Draw(OutputDevice* pOutDev, const Point& rDestPt) const;
void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const; void Draw(OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz) const;
bool IsInAnimation() const { return mbIsInAnimation; } bool IsInAnimation() const { return mbIsInAnimation; }
bool IsTransparent() const; bool IsTransparent() const;
const Size& GetDisplaySizePixel() const { return maGlobalSize; } const Size& GetDisplaySizePixel() const { return maGlobalSize; }
void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } void SetDisplaySizePixel(const Size& rSize) { maGlobalSize = rSize; }
const BitmapEx& GetBitmapEx() const { return maBitmapEx; } const BitmapEx& GetBitmapEx() const { return maBitmapEx; }
void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; } void SetBitmapEx(const BitmapEx& rBmpEx) { maBitmapEx = rBmpEx; }
sal_uInt32 GetLoopCount() const { return mnLoopCount; } sal_uInt32 GetLoopCount() const { return mnLoopCount; }
void SetLoopCount(const sal_uInt32 nLoopCount); void SetLoopCount(const sal_uInt32 nLoopCount);
void ResetLoopCount(); void ResetLoopCount();
void SetNotifyHdl( const Link<Animation*,void>& rLink ) { maNotifyLink = rLink; } void SetNotifyHdl(const Link<Animation*, void>& rLink) { maNotifyLink = rLink; }
const Link<Animation*,void>& GetNotifyHdl() const { return maNotifyLink; } const Link<Animation*, void>& GetNotifyHdl() const { return maNotifyLink; }
std::vector< std::unique_ptr<AnimationBitmap> >& GetAnimationFrames() { return maList; } std::vector<std::unique_ptr<AnimationBitmap>>& GetAnimationFrames() { return maList; }
size_t Count() const { return maList.size(); } size_t Count() const { return maList.size(); }
bool Insert( const AnimationBitmap& rAnimationBitmap ); bool Insert(const AnimationBitmap& rAnimationBitmap);
const AnimationBitmap& const AnimationBitmap& Get(sal_uInt16 nAnimation) const;
Get( sal_uInt16 nAnimation ) const; void Replace(const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation);
void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation );
sal_uLong GetSizeBytes() const; sal_uLong GetSizeBytes() const;
BitmapChecksum GetChecksum() const; BitmapChecksum GetChecksum() const;
public: public:
void Convert(BmpConversion eConversion);
void Convert( BmpConversion eConversion ); bool ReduceColors(sal_uInt16 nNewColorCount);
bool ReduceColors( sal_uInt16 nNewColorCount );
bool Invert(); bool Invert();
void Mirror( BmpMirrorFlags nMirrorFlags ); void Mirror(BmpMirrorFlags nMirrorFlags);
void Adjust( void Adjust(short nLuminancePercent, short nContrastPercent, short nChannelRPercent,
short nLuminancePercent, short nChannelGPercent, short nChannelBPercent, double fGamma = 1.0,
short nContrastPercent, bool bInvert = false);
short nChannelRPercent,
short nChannelGPercent,
short nChannelBPercent,
double fGamma = 1.0,
bool bInvert = false );
friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation );
friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
public: friend VCL_DLLPUBLIC SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation);
friend VCL_DLLPUBLIC SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation);
SAL_DLLPRIVATE static void public:
ImplIncAnimCount() { mnAnimCount++; } SAL_DLLPRIVATE static void ImplIncAnimCount() { mnAnimCount++; }
SAL_DLLPRIVATE static void SAL_DLLPRIVATE static void ImplDecAnimCount() { mnAnimCount--; }
ImplDecAnimCount() { mnAnimCount--; } SAL_DLLPRIVATE sal_uLong ImplGetCurPos() const { return mnPos; }
SAL_DLLPRIVATE sal_uLong
ImplGetCurPos() const { return mnPos; }
private: private:
SAL_DLLPRIVATE static sal_uLong mnAnimCount; SAL_DLLPRIVATE static sal_uLong mnAnimCount;
std::vector< std::unique_ptr<AnimationBitmap> > maList; std::vector<std::unique_ptr<AnimationBitmap>> maList;
std::vector< std::unique_ptr<ImplAnimView> > maViewList; std::vector<std::unique_ptr<ImplAnimView>> maViewList;
Link<Animation*,void> maNotifyLink; Link<Animation*, void> maNotifyLink;
BitmapEx maBitmapEx; BitmapEx maBitmapEx;
Timer maTimer; Timer maTimer;
Size maGlobalSize; Size maGlobalSize;
...@@ -124,9 +108,8 @@ private: ...@@ -124,9 +108,8 @@ private:
bool mbIsInAnimation; bool mbIsInAnimation;
bool mbLoopTerminated; bool mbLoopTerminated;
SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); SAL_DLLPRIVATE void ImplRestartTimer(sal_uLong nTimeout);
DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer*, void ); DECL_DLLPRIVATE_LINK(ImplTimeoutHdl, Timer*, void);
}; };
#endif // INCLUDED_VCL_ANIMATE_ANIMATION_HXX #endif // INCLUDED_VCL_ANIMATE_ANIMATION_HXX
......
include/vcl/animate/AnimationBitmap.hxx
Dosyayı görüntüle @ 9afa6661
...@@ -44,36 +44,28 @@ struct VCL_DLLPUBLIC AnimationBitmap ...@@ -44,36 +44,28 @@ struct VCL_DLLPUBLIC AnimationBitmap
: nWait(0) : nWait(0)
, eDisposal(Disposal::Not) , eDisposal(Disposal::Not)
, bUserInput(false) , bUserInput(false)
{} {
}
AnimationBitmap(
const BitmapEx& rBmpEx,
const Point& rPosPix,
const Size& rSizePix,
long _nWait = 0,
Disposal _eDisposal = Disposal::Not
) :
aBmpEx ( rBmpEx ),
aPosPix ( rPosPix ),
aSizePix ( rSizePix ),
nWait ( _nWait ),
eDisposal ( _eDisposal ),
bUserInput ( false )
{}
bool operator==( const AnimationBitmap& rAnimBmp ) const AnimationBitmap(const BitmapEx& rBmpEx, const Point& rPosPix, const Size& rSizePix,
long _nWait = 0, Disposal _eDisposal = Disposal::Not)
: aBmpEx(rBmpEx)
, aPosPix(rPosPix)
, aSizePix(rSizePix)
, nWait(_nWait)
, eDisposal(_eDisposal)
, bUserInput(false)
{ {
return( rAnimBmp.aBmpEx == aBmpEx &&
rAnimBmp.aPosPix == aPosPix &&
rAnimBmp.aSizePix == aSizePix &&
rAnimBmp.nWait == nWait &&
rAnimBmp.eDisposal == eDisposal &&
rAnimBmp.bUserInput == bUserInput );
} }
bool operator!=( const AnimationBitmap& rAnimBmp ) const bool operator==(const AnimationBitmap& rAnimBmp) const
{ return !( *this == rAnimBmp ); } {
return (rAnimBmp.aBmpEx == aBmpEx && rAnimBmp.aPosPix == aPosPix
&& rAnimBmp.aSizePix == aSizePix && rAnimBmp.nWait == nWait
&& rAnimBmp.eDisposal == eDisposal && rAnimBmp.bUserInput == bUserInput);
}
bool operator!=(const AnimationBitmap& rAnimBmp) const { return !(*this == rAnimBmp); }
BitmapChecksum GetChecksum() const; BitmapChecksum GetChecksum() const;
}; };
......
solenv/clang-format/blacklist
Dosyayı görüntüle @ 9afa6661
...@@ -7809,8 +7809,6 @@ include/vcl/accessiblefactory.hxx ...@@ -7809,8 +7809,6 @@ include/vcl/accessiblefactory.hxx
include/vcl/accessibletable.hxx include/vcl/accessibletable.hxx
include/vcl/accessibletableprovider.hxx include/vcl/accessibletableprovider.hxx
include/vcl/alpha.hxx include/vcl/alpha.hxx
include/vcl/animate/Animation.hxx
include/vcl/animate/AnimationBitmap.hxx
include/vcl/bitmap.hxx include/vcl/bitmap.hxx
include/vcl/bitmapaccess.hxx include/vcl/bitmapaccess.hxx
include/vcl/bitmapex.hxx include/vcl/bitmapex.hxx
...@@ -17757,8 +17755,6 @@ vcl/quartz/salgdicommon.cxx ...@@ -17757,8 +17755,6 @@ vcl/quartz/salgdicommon.cxx
vcl/quartz/salgdiutils.cxx vcl/quartz/salgdiutils.cxx
vcl/quartz/salvd.cxx vcl/quartz/salvd.cxx
vcl/quartz/utils.cxx vcl/quartz/utils.cxx
vcl/source/animate/Animation.cxx
vcl/source/animate/AnimationBitmap.cxx
vcl/source/app/ITiledRenderable.cxx vcl/source/app/ITiledRenderable.cxx
vcl/source/app/IconThemeInfo.cxx vcl/source/app/IconThemeInfo.cxx
vcl/source/app/IconThemeScanner.cxx vcl/source/app/IconThemeScanner.cxx
......
vcl/source/animate/AnimationBitmap.cxx
Dosyayı görüntüle @ 9afa6661
...@@ -27,26 +27,26 @@ BitmapChecksum AnimationBitmap::GetChecksum() const ...@@ -27,26 +27,26 @@ BitmapChecksum AnimationBitmap::GetChecksum() const
BitmapChecksum nCrc = aBmpEx.GetChecksum(); BitmapChecksum nCrc = aBmpEx.GetChecksum();
SVBT32 aBT32; SVBT32 aBT32;
Int32ToSVBT32( aPosPix.X(), aBT32 ); Int32ToSVBT32(aPosPix.X(), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
Int32ToSVBT32( aPosPix.Y(), aBT32 ); Int32ToSVBT32(aPosPix.Y(), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
Int32ToSVBT32( aSizePix.Width(), aBT32 ); Int32ToSVBT32(aSizePix.Width(), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
Int32ToSVBT32( aSizePix.Height(), aBT32 ); Int32ToSVBT32(aSizePix.Height(), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
Int32ToSVBT32( nWait, aBT32 ); Int32ToSVBT32(nWait, aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
UInt32ToSVBT32( o3tl::underlyingEnumValue(eDisposal), aBT32 ); UInt32ToSVBT32(o3tl::underlyingEnumValue(eDisposal), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
UInt32ToSVBT32( sal_uInt32(bUserInput), aBT32 ); UInt32ToSVBT32(sal_uInt32(bUserInput), aBT32);
nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); nCrc = vcl_get_checksum(nCrc, aBT32, 4);
return nCrc; return nCrc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment