diff options
Diffstat (limited to 'vcl/source')
51 files changed, 92 insertions, 76 deletions
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 <vcl/bitmapex.hxx> #include <vcl/BitmapAlphaClampFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <sal/log.hxx> #include <vcl/BitmapBasicMorphologyFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <algorithm> 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 <sal/config.h> -#include <algorithm> - #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapColorQuantizationFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <algorithm> #include <cstdlib> 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 <tools/color.hxx> #include <tools/helpers.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapColorizeFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapColorizeFilter.hxx> 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 <tools/helpers.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapConvolutionMatrixFilter.hxx> #include <vcl/BitmapSharpenFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> + #include <array> 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 <bitmapwriteaccess.hxx> -#include <BitmapDisabledImageFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapDisabledImageFilter.hxx> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapDuoToneFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <sal/config.h> -#include <algorithm> - #include <tools/helpers.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapEmbossGreyFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> + +#include <algorithm> 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 <salbmp.hxx> #include <salinst.hxx> #include <svdata.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <o3tl/any.hxx> 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 <sal/log.hxx> #include <tools/helpers.hxx> #include <vcl/bitmapex.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapFastScaleFilter.hxx> -#include <sal/log.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapFastScaleFilter.hxx> 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 <vcl/BitmapFilterStackBlur.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <sal/log.hxx> #include <comphelper/threadpool.hxx> 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 <tools/helpers.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapGaussianSeparableBlurFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <vcl/bitmapex.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapFastScaleFilter.hxx> -#include <BitmapInterpolateScaleFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapFastScaleFilter.hxx> +#include <bitmap/BitmapInterpolateScaleFilter.hxx> 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 <basegfx/color/bcolortools.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapLightenFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapLightenFilter.hxx> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapMedianFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #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 <vcl/bitmapex.hxx> #include <vcl/BitmapMonochromeFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapMosaicFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapPopArtFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <osl/diagnose.h> #include <tools/helpers.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapScaleConvolutionFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapScaleConvolutionFilter.hxx> #include <algorithm> #include <memory> 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 <comphelper/threadpool.hxx> - #include <tools/helpers.hxx> -#include <bitmapwriteaccess.hxx> -#include <BitmapScaleSuperFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/BitmapScaleSuperFilter.hxx> #include <algorithm> #include <memory> 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 <tools/helpers.hxx> + #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapGaussianSeparableBlurFilter.hxx> #include <vcl/BitmapSeparableUnsharpenFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <sal/config.h> -#include <algorithm> - #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapSepiaFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> + +#include <algorithm> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapSimpleColorQuantizationFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <bitmap/Octree.hxx> 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 <sal/config.h> -#include <algorithm> - #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BitmapSobelGreyFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> + +#include <algorithm> 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 <vcl/bitmapex.hxx> #include <vcl/BitmapSolarizeFilter.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <tools/diagnose_ex.h> #include <tools/fract.hxx> #include <tools/stream.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> 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 <sal/log.hxx> #include <tools/debug.hxx> -#include <bitmapwriteaccess.hxx> -#include <bmpfast.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/bmpfast.hxx> 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 <tools/color.hxx> #include <vcl/alpha.hxx> -#include <bitmapwriteaccess.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> #include <salinst.hxx> #include <svdata.hxx> #include <salbmp.hxx> 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 <svdata.hxx> #include <salinst.hxx> #include <salbmp.hxx> -#include <bitmapwriteaccess.hxx> #if HAVE_FEATURE_SKIA #include <vcl/skia/SkiaHelper.hxx> #endif #include <vcl/BitmapMonochromeFilter.hxx> -#include <BitmapScaleSuperFilter.hxx> -#include <BitmapScaleConvolutionFilter.hxx> -#include <BitmapFastScaleFilter.hxx> -#include <BitmapInterpolateScaleFilter.hxx> +#include <bitmap/BitmapScaleSuperFilter.hxx> +#include <bitmap/BitmapScaleConvolutionFilter.hxx> +#include <bitmap/BitmapFastScaleFilter.hxx> +#include <bitmap/BitmapInterpolateScaleFilter.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <bitmap/impoctree.hxx> #include <bitmap/Octree.hxx> 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 <tools/poly.hxx> #include <tools/helpers.hxx> + #include <vcl/bitmap.hxx> #include <vcl/alpha.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <salbmp.hxx> #include <svdata.hxx> #include <salinst.hxx> 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 <bmpfast.hxx> #include <vcl/salgtype.hxx> -#include <bitmapwriteaccess.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/bmpfast.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <sal/log.hxx> 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 <unotools/configmgr.hxx> #include <vcl/bitmapex.hxx> #include <vcl/outdev.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <memory> #define DIBCOREHEADERSIZE ( 12UL ) diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 180e9d6fa1e2..72cb9a7495d1 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -22,7 +22,7 @@ #include "decode.hxx" #include "gifread.hxx" #include <memory> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <graphic/GraphicReader.hxx> #define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING ) diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index dbfa5ceeaf68..ecc22331520a 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -18,7 +18,7 @@ #endif #include <vcl/graph.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/datetime.hxx> diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 0d1269ac5586..1cbb69fdb940 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -22,7 +22,8 @@ #include <tools/stream.hxx> #include <rtl/character.hxx> -#include <bitmapwriteaccess.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> #include <graphic/GraphicReader.hxx> #include "xbmread.hxx" diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index ef6b7082818e..e96a097da0da 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -17,12 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <bitmapwriteaccess.hxx> #include <vcl/graph.hxx> #include <tools/stream.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> #include <graphic/GraphicReader.hxx> + #include "rgbtable.hxx" #include "xpmread.hxx" + #include <cstring> #include <array> #include <map> diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx index c9bf90806ade..f9a2eb2929aa 100644 --- a/vcl/source/filter/jpeg/JpegReader.hxx +++ b/vcl/source/filter/jpeg/JpegReader.hxx @@ -22,7 +22,8 @@ #include <vcl/graph.hxx> #include <vcl/bitmap.hxx> -#include <bitmapwriteaccess.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> #include <graphic/GraphicReader.hxx> enum class GraphicFilterImportFlags; diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h index fb28e78ee7e2..a7ddcffa6ece 100644 --- a/vcl/source/filter/jpeg/jpeg.h +++ b/vcl/source/filter/jpeg/jpeg.h @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <basegfx/vector/b2dsize.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <jpeglib.h> diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index e097ed40bc96..96c9280c2483 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -22,8 +22,10 @@ #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> + #include <com/sun/star/uno/Sequence.h> -#include <bitmapwriteaccess.hxx> VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess ); diff --git a/vcl/source/filter/png/PngImageReader.cxx b/vcl/source/filter/png/PngImageReader.cxx index ab5097bfce2c..58e67156b029 100644 --- a/vcl/source/filter/png/PngImageReader.cxx +++ b/vcl/source/filter/png/PngImageReader.cxx @@ -11,10 +11,11 @@ #include <vcl/filter/PngImageReader.hxx> #include <png.h> #include <tools/stream.hxx> -#include <bitmapwriteaccess.hxx> #include <vcl/bitmap.hxx> #include <vcl/alpha.hxx> #include <vcl/BitmapTools.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> #include <svdata.hxx> #include <salinst.hxx> diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx index 2155648d1273..19a50e9ae822 100644 --- a/vcl/source/filter/png/pngread.cxx +++ b/vcl/source/filter/png/pngread.cxx @@ -33,7 +33,8 @@ #include <tools/stream.hxx> #include <vcl/alpha.hxx> #include <osl/endian.h> -#include <bitmapwriteaccess.hxx> + +#include <bitmap/BitmapWriteAccess.hxx> namespace vcl { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 968af851ae86..3ba778e09d49 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -68,7 +68,7 @@ #include <vcl/filter/pdfdocument.hxx> #include <comphelper/hash.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <fontsubset.hxx> #include <PhysicalFontFace.hxx> #include <salgdi.hxx> diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 648c61627b78..593b2b706888 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -19,7 +19,7 @@ #include <vcl/BitmapReadAccess.hxx> #include <vcl/salgtype.hxx> -#include <bmpfast.hxx> +#include <bitmap/bmpfast.hxx> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 5621e4994fa5..151cb991c050 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -42,7 +42,7 @@ #include <canvasbitmap.hxx> #include <vcl/canvastools.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> using namespace ::com::sun::star; diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index 54799c5a60b1..efcc46e41ea4 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -25,7 +25,7 @@ #include <sal/types.h> #include <image.h> -#include <BitmapColorizeFilter.hxx> +#include <bitmap/BitmapColorizeFilter.hxx> using namespace css; diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx index 8659d8e11e50..ad9429e00cca 100644 --- a/vcl/source/image/ImplImage.cxx +++ b/vcl/source/image/ImplImage.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> #include <vcl/BitmapFilter.hxx> #include <vcl/ImageTree.hxx> -#include <BitmapDisabledImageFilter.hxx> +#include <bitmap/BitmapDisabledImageFilter.hxx> #include <comphelper/lok.hxx> #include <image.h> diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index b7215ac65b97..6a9cd8f75628 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -55,7 +55,7 @@ #include <vcl/outdev.hxx> #include <vcl/pngwrite.hxx> -#include <BitmapLightenFilter.hxx> +#include <bitmap/BitmapLightenFilter.hxx> using namespace css; diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 25c2912c620d..3d2a978e1927 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -33,7 +33,7 @@ #include <vcl/opengl/OpenGLWrapper.hxx> #include <vcl/opengl/OpenGLContext.hxx> #include <desktop/crashreport.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> #include <watchdog.hxx> #include <vcl/skia/SkiaHelper.hxx> #include <vcl/glxtestprocess.hxx> diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 9f5ef1f51f20..a7e2bcb89b3d 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -33,14 +33,14 @@ #include <vcl/image.hxx> #include <vcl/BitmapMonochromeFilter.hxx> -#include <bmpfast.hxx> +#include <bitmap/BitmapWriteAccess.hxx> +#include <bitmap/bmpfast.hxx> #include <salgdi.hxx> #include <salbmp.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <memory> #include <comphelper/lok.hxx> -#include <bitmapwriteaccess.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/helpers.hxx> diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index c6e0406f319c..28a030963018 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -32,7 +32,7 @@ #include <vcl/virdev.hxx> #include <salgdi.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> namespace { diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx index 6b535c52c5e2..291e340abc40 100644 --- a/vcl/source/pdf/PDFiumLibrary.cxx +++ b/vcl/source/pdf/PDFiumLibrary.cxx @@ -25,7 +25,7 @@ #include <vcl/bitmap.hxx> #include <tools/stream.hxx> -#include <bitmapwriteaccess.hxx> +#include <bitmap/BitmapWriteAccess.hxx> using namespace com::sun::star; |