[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source

[Stephan Bergmann]

 include/vcl/bitmapfilter.hxx           |   27 ---------------------
 include/vcl/bitmapscalesuper.hxx       |   41 ---------------------------------
 vcl/inc/BitmapScaleConvolution.hxx     |    2 -
 vcl/inc/bitmapfilter.hxx               |   27 +++++++++++++++++++++
 vcl/inc/bitmapscalesuper.hxx           |   41 +++++++++++++++++++++++++++++++++
 vcl/source/bitmap/bitmapfilter.cxx     |    2 -
 vcl/source/bitmap/bitmapscalesuper.cxx |    2 -
 vcl/source/gdi/bitmap3.cxx             |    2 -
 8 files changed, 72 insertions(+), 72 deletions(-)

New commits:
commit 4f7280e4cc34a284b91473cefcb179f04a1d7a08
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 1 16:02:12 2016 +0100

    BitmapFilter, BitmapScaleSuper only used within vcl
    
    Change-Id: Ia8a1207a584b599f01c47b658692d3eeae52cb3a

diff --git a/vcl/inc/BitmapScaleConvolution.hxx b/vcl/inc/BitmapScaleConvolution.hxx
index 032772f..e18c71f 100644
--- a/vcl/inc/BitmapScaleConvolution.hxx
+++ b/vcl/inc/BitmapScaleConvolution.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_BITMAPSCALECONVOLUTION_HXX
 #define INCLUDED_VCL_BITMAPSCALECONVOLUTION_HXX
 
-#include <vcl/bitmapfilter.hxx>
+#include <bitmapfilter.hxx>
 
 namespace vcl
 {
diff --git a/include/vcl/bitmapfilter.hxx b/vcl/inc/bitmapfilter.hxx
similarity index 78%
rename from include/vcl/bitmapfilter.hxx
rename to vcl/inc/bitmapfilter.hxx
index c23bd7f..66dc4cc 100644
--- a/include/vcl/bitmapfilter.hxx
+++ b/vcl/inc/bitmapfilter.hxx
@@ -8,12 +8,12 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPFILTER_HXX
-#define INCLUDED_VCL_BITMAPFILTER_HXX
+#ifndef INCLUDED_VCL_INC_BITMAPFILTER_HXX
+#define INCLUDED_VCL_INC_BITMAPFILTER_HXX
 
 #include <vcl/bitmap.hxx>
 
-class VCL_DLLPUBLIC BitmapFilter
+class BitmapFilter
 {
 public:
                  BitmapFilter();
@@ -22,6 +22,6 @@ public:
     virtual bool filter(Bitmap& rBitmap) = 0;
 };
 
-#endif // INCLUDED_VCL_BITMAPFILTER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/bitmapscalesuper.hxx b/vcl/inc/bitmapscalesuper.hxx
similarity index 84%
rename from include/vcl/bitmapscalesuper.hxx
rename to vcl/inc/bitmapscalesuper.hxx
index ad817b5..bbdf59a 100644
--- a/include/vcl/bitmapscalesuper.hxx
+++ b/vcl/inc/bitmapscalesuper.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_BITMAPSCALESUPER_HXX
-#define INCLUDED_VCL_BITMAPSCALESUPER_HXX
+#ifndef INCLUDED_VCL_INC_BITMAPSCALESUPER_HXX
+#define INCLUDED_VCL_INC_BITMAPSCALESUPER_HXX
 
-#include <vcl/bitmapfilter.hxx>
+#include <bitmapfilter.hxx>
 
-class VCL_DLLPUBLIC BitmapScaleSuper : public BitmapFilter
+class BitmapScaleSuper : public BitmapFilter
 {
 public:
                     BitmapScaleSuper(const double& rScaleX, const double& rScaleY);
@@ -36,6 +36,6 @@ private:
 
 };
 
-#endif // INCLUDED_VCL_BITMAPSCALESUPER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx
index c04f341..34ff09f 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -8,7 +8,7 @@
  *
  */
 
-#include <vcl/bitmapfilter.hxx>
+#include <bitmapfilter.hxx>
 
 BitmapFilter::BitmapFilter()
 {}
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx
index ff01aae..ae540e5 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/bitmapaccess.hxx>
-#include <vcl/bitmapscalesuper.hxx>
+#include <bitmapscalesuper.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index fcf3751..faaa653 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -23,7 +23,6 @@
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/bitmapscalesuper.hxx>
 #include <config_features.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLHelper.hxx>
@@ -34,6 +33,7 @@
 #include "impoctree.hxx"
 #include "impvect.hxx"
 
+#include <bitmapscalesuper.hxx>
 #include "octree.hxx"
 #include "BitmapScaleConvolution.hxx"