Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ba6cbddd
Kaydet (Commit)
ba6cbddd
authored
Eyl 21, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove some unused params
Change-Id: Id4f6da92526cea3e9b01bd23f6569843dfb17d89
üst
55dda8e8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
43 deletions
+34
-43
animate.hxx
include/vcl/animate.hxx
+1
-2
bitmap.hxx
include/vcl/bitmap.hxx
+10
-13
bitmapex.hxx
include/vcl/bitmapex.hxx
+1
-5
animate.cxx
vcl/source/gdi/animate.cxx
+3
-3
bitmap4.cxx
vcl/source/gdi/bitmap4.cxx
+17
-18
bitmapex.cxx
vcl/source/gdi/bitmapex.cxx
+2
-2
No files found.
include/vcl/animate.hxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -184,8 +184,7 @@ public:
...
@@ -184,8 +184,7 @@ public:
bool
Filter
(
bool
Filter
(
BmpFilter
eFilter
,
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
=
NULL
,
const
BmpFilterParam
*
pFilterParam
=
NULL
);
const
Link
<>*
pProgress
=
NULL
);
friend
VCL_DLLPUBLIC
SvStream
&
ReadAnimation
(
SvStream
&
rIStream
,
Animation
&
rAnimation
);
friend
VCL_DLLPUBLIC
SvStream
&
ReadAnimation
(
SvStream
&
rIStream
,
Animation
&
rAnimation
);
friend
VCL_DLLPUBLIC
SvStream
&
WriteAnimation
(
SvStream
&
rOStream
,
const
Animation
&
rAnimation
);
friend
VCL_DLLPUBLIC
SvStream
&
WriteAnimation
(
SvStream
&
rOStream
,
const
Animation
&
rAnimation
);
...
...
include/vcl/bitmap.hxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -716,8 +716,7 @@ public:
...
@@ -716,8 +716,7 @@ public:
*/
*/
bool
Filter
(
bool
Filter
(
BmpFilter
eFilter
,
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
=
NULL
,
const
BmpFilterParam
*
pFilterParam
=
NULL
);
const
Link
<>*
pProgress
=
NULL
);
public
:
public
:
...
@@ -759,17 +758,15 @@ public:
...
@@ -759,17 +758,15 @@ public:
long
nColors
,
long
nPixels
,
long
&
rIndex
);
long
nColors
,
long
nPixels
,
long
&
rIndex
);
SAL_DLLPRIVATE
bool
ImplConvolute3
(
SAL_DLLPRIVATE
bool
ImplConvolute3
(
const
long
*
pMatrix
,
long
nDivisor
,
const
long
*
pMatrix
,
long
nDivisor
);
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplMedianFilter
();
SAL_DLLPRIVATE
bool
ImplSobelGrey
();
SAL_DLLPRIVATE
bool
ImplMedianFilter
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplEmbossGrey
(
const
BmpFilterParam
*
pFilterParam
);
SAL_DLLPRIVATE
bool
ImplSobelGrey
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplSolarize
(
const
BmpFilterParam
*
pFilterParam
);
SAL_DLLPRIVATE
bool
ImplEmbossGrey
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplSepia
(
const
BmpFilterParam
*
pFilterParam
);
SAL_DLLPRIVATE
bool
ImplSolarize
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplMosaic
(
const
BmpFilterParam
*
pFilterParam
);
SAL_DLLPRIVATE
bool
ImplSepia
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplPopArt
();
SAL_DLLPRIVATE
bool
ImplMosaic
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplPopArt
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
);
SAL_DLLPRIVATE
bool
ImplSeparableBlurFilter
(
const
double
aRadius
=
0.7
);
SAL_DLLPRIVATE
bool
ImplSeparableBlurFilter
(
const
double
aRadius
=
0.7
);
SAL_DLLPRIVATE
bool
ImplSeparableUnsharpenFilter
(
const
double
aRadius
=
0.7
);
SAL_DLLPRIVATE
bool
ImplSeparableUnsharpenFilter
(
const
double
aRadius
=
0.7
);
...
...
include/vcl/bitmapex.hxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -361,15 +361,11 @@ public:
...
@@ -361,15 +361,11 @@ public:
@param pFilterParam
@param pFilterParam
Various parameter for the different bitmap filter algorithms
Various parameter for the different bitmap filter algorithms
@param pProgress
A callback for showing the progress of the vectorization
@return true, if the operation was completed successfully.
@return true, if the operation was completed successfully.
*/
*/
bool
Filter
(
bool
Filter
(
BmpFilter
eFilter
,
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
=
NULL
,
const
BmpFilterParam
*
pFilterParam
=
NULL
);
const
Link
<>*
pProgress
=
NULL
);
/** Get transparency at given position
/** Get transparency at given position
...
...
vcl/source/gdi/animate.cxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -666,7 +666,7 @@ bool Animation::Adjust( short nLuminancePercent, short nContrastPercent,
...
@@ -666,7 +666,7 @@ bool Animation::Adjust( short nLuminancePercent, short nContrastPercent,
return
bRet
;
return
bRet
;
}
}
bool
Animation
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
)
bool
Animation
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
)
{
{
DBG_ASSERT
(
!
IsInAnimation
(),
"Animation modified while it is animated"
);
DBG_ASSERT
(
!
IsInAnimation
(),
"Animation modified while it is animated"
);
...
@@ -677,9 +677,9 @@ bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, c
...
@@ -677,9 +677,9 @@ bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, c
bRet
=
true
;
bRet
=
true
;
for
(
size_t
i
=
0
,
n
=
maList
.
size
();
(
i
<
n
)
&&
bRet
;
++
i
)
for
(
size_t
i
=
0
,
n
=
maList
.
size
();
(
i
<
n
)
&&
bRet
;
++
i
)
bRet
=
maList
[
i
]
->
aBmpEx
.
Filter
(
eFilter
,
pFilterParam
,
pProgress
);
bRet
=
maList
[
i
]
->
aBmpEx
.
Filter
(
eFilter
,
pFilterParam
);
(
void
)
maBitmapEx
.
Filter
(
eFilter
,
pFilterParam
,
pProgress
);
(
void
)
maBitmapEx
.
Filter
(
eFilter
,
pFilterParam
);
}
}
else
else
bRet
=
false
;
bRet
=
false
;
...
...
vcl/source/gdi/bitmap4.cxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -38,7 +38,7 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent( sal_uInt8 base, sal_uInt16
...
@@ -38,7 +38,7 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent( sal_uInt8 base, sal_uInt16
return
(
sal_uInt8
)
(
color1
+
color2
);
return
(
sal_uInt8
)
(
color1
+
color2
);
}
}
bool
Bitmap
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
)
bool
Bitmap
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
)
{
{
bool
bRet
=
false
;
bool
bRet
=
false
;
...
@@ -66,36 +66,36 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
...
@@ -66,36 +66,36 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
case
(
BMP_FILTER_SHARPEN
):
case
(
BMP_FILTER_SHARPEN
):
{
{
const
long
pSharpenMatrix
[]
=
{
-
1
,
-
1
,
-
1
,
-
1
,
16
,
-
1
,
-
1
,
-
1
,
-
1
};
const
long
pSharpenMatrix
[]
=
{
-
1
,
-
1
,
-
1
,
-
1
,
16
,
-
1
,
-
1
,
-
1
,
-
1
};
bRet
=
ImplConvolute3
(
&
pSharpenMatrix
[
0
],
8
,
pFilterParam
,
pProgress
);
bRet
=
ImplConvolute3
(
&
pSharpenMatrix
[
0
],
8
);
}
}
break
;
break
;
case
(
BMP_FILTER_REMOVENOISE
):
case
(
BMP_FILTER_REMOVENOISE
):
bRet
=
ImplMedianFilter
(
pFilterParam
,
pProgress
);
bRet
=
ImplMedianFilter
();
break
;
break
;
case
(
BMP_FILTER_SOBEL_GREY
):
case
(
BMP_FILTER_SOBEL_GREY
):
bRet
=
ImplSobelGrey
(
pFilterParam
,
pProgress
);
bRet
=
ImplSobelGrey
();
break
;
break
;
case
(
BMP_FILTER_SOLARIZE
):
case
(
BMP_FILTER_SOLARIZE
):
bRet
=
ImplSolarize
(
pFilterParam
,
pProgress
);
bRet
=
ImplSolarize
(
pFilterParam
);
break
;
break
;
case
(
BMP_FILTER_SEPIA
):
case
(
BMP_FILTER_SEPIA
):
bRet
=
ImplSepia
(
pFilterParam
,
pProgress
);
bRet
=
ImplSepia
(
pFilterParam
);
break
;
break
;
case
(
BMP_FILTER_MOSAIC
):
case
(
BMP_FILTER_MOSAIC
):
bRet
=
ImplMosaic
(
pFilterParam
,
pProgress
);
bRet
=
ImplMosaic
(
pFilterParam
);
break
;
break
;
case
(
BMP_FILTER_EMBOSS_GREY
):
case
(
BMP_FILTER_EMBOSS_GREY
):
bRet
=
ImplEmbossGrey
(
pFilterParam
,
pProgress
);
bRet
=
ImplEmbossGrey
(
pFilterParam
);
break
;
break
;
case
(
BMP_FILTER_POPART
):
case
(
BMP_FILTER_POPART
):
bRet
=
ImplPopArt
(
pFilterParam
,
pProgress
);
bRet
=
ImplPopArt
();
break
;
break
;
case
(
BMP_FILTER_DUOTONE
):
case
(
BMP_FILTER_DUOTONE
):
...
@@ -110,8 +110,7 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
...
@@ -110,8 +110,7 @@ bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplConvolute3
(
const
long
*
pMatrix
,
long
nDivisor
,
bool
Bitmap
::
ImplConvolute3
(
const
long
*
pMatrix
,
long
nDivisor
)
const
BmpFilterParam
*
/*pFilterParam*/
,
const
Link
<>*
/*pProgress*/
)
{
{
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
bool
bRet
=
false
;
bool
bRet
=
false
;
...
@@ -256,7 +255,7 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
...
@@ -256,7 +255,7 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplMedianFilter
(
const
BmpFilterParam
*
/*pFilterParam*/
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplMedianFilter
()
{
{
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
bool
bRet
=
false
;
bool
bRet
=
false
;
...
@@ -385,7 +384,7 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
...
@@ -385,7 +384,7 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplSobelGrey
(
const
BmpFilterParam
*
/*pFilterParam*/
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplSobelGrey
()
{
{
bool
bRet
=
ImplMakeGreyscales
(
256
);
bool
bRet
=
ImplMakeGreyscales
(
256
);
...
@@ -511,7 +510,7 @@ bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link<>
...
@@ -511,7 +510,7 @@ bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link<>
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplEmbossGrey
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplEmbossGrey
(
const
BmpFilterParam
*
pFilterParam
)
{
{
bool
bRet
=
ImplMakeGreyscales
(
256
);
bool
bRet
=
ImplMakeGreyscales
(
256
);
...
@@ -623,7 +622,7 @@ bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* /
...
@@ -623,7 +622,7 @@ bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* /
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplSolarize
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplSolarize
(
const
BmpFilterParam
*
pFilterParam
)
{
{
bool
bRet
=
false
;
bool
bRet
=
false
;
BitmapWriteAccess
*
pWriteAcc
=
AcquireWriteAccess
();
BitmapWriteAccess
*
pWriteAcc
=
AcquireWriteAccess
();
...
@@ -671,7 +670,7 @@ bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* /*p
...
@@ -671,7 +670,7 @@ bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* /*p
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplSepia
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplSepia
(
const
BmpFilterParam
*
pFilterParam
)
{
{
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
BitmapReadAccess
*
pReadAcc
=
AcquireReadAccess
();
bool
bRet
=
false
;
bool
bRet
=
false
;
...
@@ -756,7 +755,7 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* /*pPro
...
@@ -756,7 +755,7 @@ bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* /*pPro
return
bRet
;
return
bRet
;
}
}
bool
Bitmap
::
ImplMosaic
(
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplMosaic
(
const
BmpFilterParam
*
pFilterParam
)
{
{
sal_uLong
nTileWidth
=
(
pFilterParam
&&
pFilterParam
->
meFilter
==
BMP_FILTER_MOSAIC
)
?
sal_uLong
nTileWidth
=
(
pFilterParam
&&
pFilterParam
->
meFilter
==
BMP_FILTER_MOSAIC
)
?
pFilterParam
->
maMosaicTileSize
.
mnTileWidth
:
4
;
pFilterParam
->
maMosaicTileSize
.
mnTileWidth
:
4
;
...
@@ -941,7 +940,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
...
@@ -941,7 +940,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 )
return
nRet
;
return
nRet
;
}
}
bool
Bitmap
::
ImplPopArt
(
const
BmpFilterParam
*
/*pFilterParam*/
,
const
Link
<>*
/*pProgress*/
)
bool
Bitmap
::
ImplPopArt
()
{
{
bool
bRet
=
(
GetBitCount
()
<=
8
)
||
Convert
(
BMP_CONVERSION_8BIT_COLORS
);
bool
bRet
=
(
GetBitCount
()
<=
8
)
||
Convert
(
BMP_CONVERSION_8BIT_COLORS
);
...
...
vcl/source/gdi/bitmapex.cxx
Dosyayı görüntüle @
ba6cbddd
...
@@ -642,9 +642,9 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
...
@@ -642,9 +642,9 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent,
fGamma
,
bInvert
,
msoBrightness
);
fGamma
,
bInvert
,
msoBrightness
);
}
}
bool
BitmapEx
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
,
const
Link
<>*
pProgress
)
bool
BitmapEx
::
Filter
(
BmpFilter
eFilter
,
const
BmpFilterParam
*
pFilterParam
)
{
{
return
!!
aBitmap
&&
aBitmap
.
Filter
(
eFilter
,
pFilterParam
,
pProgress
);
return
!!
aBitmap
&&
aBitmap
.
Filter
(
eFilter
,
pFilterParam
);
}
}
void
BitmapEx
::
Draw
(
OutputDevice
*
pOutDev
,
const
Point
&
rDestPt
)
const
void
BitmapEx
::
Draw
(
OutputDevice
*
pOutDev
,
const
Point
&
rDestPt
)
const
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment