From c1f96102cb117f8c2c977da11b932cd9937ae19e Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sat, 19 Dec 2020 04:42:58 +1100 Subject: vcl: move local bitmap headers to inc/bitmap directory Change-Id: I72cc28d4df8031e322daa50d79666cabcb6421a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108040 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- vcl/source/bitmap/BitmapAlphaClampFilter.cxx | 2 +- vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx | 2 +- vcl/source/bitmap/BitmapColorQuantizationFilter.cxx | 5 ++--- vcl/source/bitmap/BitmapColorizeFilter.cxx | 4 ++-- vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx | 4 +++- vcl/source/bitmap/BitmapDisabledImageFilter.cxx | 4 ++-- vcl/source/bitmap/BitmapDuoToneFilter.cxx | 2 +- vcl/source/bitmap/BitmapEmbossGreyFilter.cxx | 7 ++++--- vcl/source/bitmap/BitmapEx.cxx | 2 +- vcl/source/bitmap/BitmapFastScaleFilter.cxx | 6 +++--- vcl/source/bitmap/BitmapFilterStackBlur.cxx | 2 +- vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx | 3 ++- vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx | 6 +++--- vcl/source/bitmap/BitmapLightenFilter.cxx | 4 ++-- vcl/source/bitmap/BitmapMedianFilter.cxx | 2 +- vcl/source/bitmap/BitmapMonochromeFilter.cxx | 2 +- vcl/source/bitmap/BitmapMosaicFilter.cxx | 2 +- vcl/source/bitmap/BitmapPopArtFilter.cxx | 2 +- vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx | 4 ++-- vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 5 ++--- vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx | 3 ++- vcl/source/bitmap/BitmapSepiaFilter.cxx | 6 +++--- vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx | 2 +- vcl/source/bitmap/BitmapSobelGreyFilter.cxx | 6 +++--- vcl/source/bitmap/BitmapSolarizeFilter.cxx | 2 +- vcl/source/bitmap/BitmapTools.cxx | 2 +- vcl/source/bitmap/BitmapWriteAccess.cxx | 4 ++-- vcl/source/bitmap/alpha.cxx | 3 ++- vcl/source/bitmap/bitmap.cxx | 10 +++++----- vcl/source/bitmap/bitmappaint.cxx | 3 ++- vcl/source/bitmap/bmpfast.cxx | 6 ++++-- vcl/source/bitmap/dibtools.cxx | 2 +- 32 files changed, 63 insertions(+), 56 deletions(-) (limited to 'vcl/source/bitmap') diff --git a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx index 9753d82666fd..d9bc79ad92b6 100644 --- a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx +++ b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include BitmapEx BitmapAlphaClampFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx index c3a440fa18bd..0544943b3417 100644 --- a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx +++ b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx index 34ed5929dfac..6cbf97a274ee 100644 --- a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx +++ b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx @@ -10,14 +10,13 @@ #include -#include - #include #include #include -#include +#include +#include #include BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const diff --git a/vcl/source/bitmap/BitmapColorizeFilter.cxx b/vcl/source/bitmap/BitmapColorizeFilter.cxx index 4e063e1ef75a..068bbbffb647 100644 --- a/vcl/source/bitmap/BitmapColorizeFilter.cxx +++ b/vcl/source/bitmap/BitmapColorizeFilter.cxx @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include BitmapEx BitmapColorizeFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx index 94eb81675bd2..9d41b5039193 100644 --- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx +++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx @@ -9,12 +9,14 @@ */ #include + #include #include #include #include -#include +#include + #include BitmapEx BitmapConvolutionMatrixFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx index 4a70bed1ccb9..25f32d69f0c6 100644 --- a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx +++ b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx @@ -8,8 +8,8 @@ * */ -#include -#include +#include +#include BitmapEx BitmapDisabledImageFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapDuoToneFilter.cxx b/vcl/source/bitmap/BitmapDuoToneFilter.cxx index f72edb79a438..040f753386fd 100644 --- a/vcl/source/bitmap/BitmapDuoToneFilter.cxx +++ b/vcl/source/bitmap/BitmapDuoToneFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include static sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16 color1, sal_uInt16 color2) { diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx index 173de3f3fefa..d285bfb2b2a8 100644 --- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx +++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx @@ -10,14 +10,15 @@ #include -#include - #include + #include #include #include -#include +#include + +#include BitmapEx BitmapEmbossGreyFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx index 35936c2ff8ab..08da777e3cc5 100644 --- a/vcl/source/bitmap/BitmapEx.cxx +++ b/vcl/source/bitmap/BitmapEx.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/vcl/source/bitmap/BitmapFastScaleFilter.cxx b/vcl/source/bitmap/BitmapFastScaleFilter.cxx index 9969abcd8892..0bcbc27ab8c7 100644 --- a/vcl/source/bitmap/BitmapFastScaleFilter.cxx +++ b/vcl/source/bitmap/BitmapFastScaleFilter.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include -#include -#include -#include +#include +#include BitmapEx BitmapFastScaleFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx index 0d4f67d2dbfe..e7d791194a94 100644 --- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx +++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx index 5426195ba36e..bf39a22298ce 100644 --- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx +++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx @@ -9,11 +9,12 @@ */ #include + #include #include #include -#include +#include BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx index 9f6fee90cc7e..06e16d460624 100644 --- a/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx +++ b/vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include BitmapEx BitmapInterpolateScaleFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapLightenFilter.cxx b/vcl/source/bitmap/BitmapLightenFilter.cxx index 489fba611394..137f69234453 100644 --- a/vcl/source/bitmap/BitmapLightenFilter.cxx +++ b/vcl/source/bitmap/BitmapLightenFilter.cxx @@ -10,8 +10,8 @@ #include -#include -#include +#include +#include BitmapEx BitmapLightenFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx b/vcl/source/bitmap/BitmapMedianFilter.cxx index 1dd7b3b552b0..9f2e2ce60d7d 100644 --- a/vcl/source/bitmap/BitmapMedianFilter.cxx +++ b/vcl/source/bitmap/BitmapMedianFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #define S2(a, b) \ { \ diff --git a/vcl/source/bitmap/BitmapMonochromeFilter.cxx b/vcl/source/bitmap/BitmapMonochromeFilter.cxx index 9347eca5f5e4..a460f58923ff 100644 --- a/vcl/source/bitmap/BitmapMonochromeFilter.cxx +++ b/vcl/source/bitmap/BitmapMonochromeFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include BitmapEx BitmapMonochromeFilter::execute(BitmapEx const& aBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx b/vcl/source/bitmap/BitmapMosaicFilter.cxx index 68afdfab0a39..2f1e8ec8d704 100644 --- a/vcl/source/bitmap/BitmapMosaicFilter.cxx +++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx b/vcl/source/bitmap/BitmapPopArtFilter.cxx index bf33a98381f4..54e0aa2d2f15 100644 --- a/vcl/source/bitmap/BitmapPopArtFilter.cxx +++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx index cc01bae62adf..21205d020360 100644 --- a/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx +++ b/vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx index c655d8fac975..a15ec0ab9fb8 100644 --- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx +++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx @@ -18,11 +18,10 @@ */ #include - #include -#include -#include +#include +#include #include #include diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx index ab545951ed5e..002976816c17 100644 --- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx +++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx @@ -9,12 +9,13 @@ */ #include + #include #include #include #include -#include +#include BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx index 43d1a9e78109..7093c5048616 100644 --- a/vcl/source/bitmap/BitmapSepiaFilter.cxx +++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx @@ -10,13 +10,13 @@ #include -#include - #include #include #include -#include +#include + +#include BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx index 81e129af32bb..8ff988ab3407 100644 --- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx +++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include BitmapEx BitmapSimpleColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const diff --git a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx index e03781975836..f042f10bf51e 100644 --- a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx +++ b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx @@ -10,13 +10,13 @@ #include -#include - #include #include #include -#include +#include + +#include BitmapEx BitmapSobelGreyFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx index c4df366a65cb..724e28bde2ac 100644 --- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx +++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 7dcc8245fdd0..3d2ee474554f 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include using namespace css; diff --git a/vcl/source/bitmap/BitmapWriteAccess.cxx b/vcl/source/bitmap/BitmapWriteAccess.cxx index e94bf5952016..c3613223ea94 100644 --- a/vcl/source/bitmap/BitmapWriteAccess.cxx +++ b/vcl/source/bitmap/BitmapWriteAccess.cxx @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include BitmapWriteAccess::BitmapWriteAccess(Bitmap& rBitmap) : BitmapReadAccess(rBitmap, BitmapAccessMode::Write) diff --git a/vcl/source/bitmap/alpha.cxx b/vcl/source/bitmap/alpha.cxx index 11b2fefba4ce..fb1402f5ad9e 100644 --- a/vcl/source/bitmap/alpha.cxx +++ b/vcl/source/bitmap/alpha.cxx @@ -19,7 +19,8 @@ #include #include -#include + +#include #include #include #include diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 70b450d34b14..7210a20a5e16 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -30,16 +30,16 @@ #include #include #include -#include #if HAVE_FEATURE_SKIA #include #endif #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/vcl/source/bitmap/bitmappaint.cxx b/vcl/source/bitmap/bitmappaint.cxx index 98d50d5f87bc..b69972788746 100644 --- a/vcl/source/bitmap/bitmappaint.cxx +++ b/vcl/source/bitmap/bitmappaint.cxx @@ -19,10 +19,11 @@ #include #include + #include #include -#include +#include #include #include #include diff --git a/vcl/source/bitmap/bmpfast.cxx b/vcl/source/bitmap/bmpfast.cxx index f868d698da08..119250a72bbe 100644 --- a/vcl/source/bitmap/bmpfast.cxx +++ b/vcl/source/bitmap/bmpfast.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include -#include + +#include +#include +#include #include diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx index c10c76513dd8..08f821d37ac9 100644 --- a/vcl/source/bitmap/dibtools.cxx +++ b/vcl/source/bitmap/dibtools.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define DIBCOREHEADERSIZE ( 12UL ) -- cgit