[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/source

[Libreoffice Gerrit user]

 solenv/clang-format/blacklist |    4 ++--
 vcl/Library_vcl.mk            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e1a5dd01bdaee3cac2edeb8c9d568c92ed8c4011
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Feb 14 14:17:11 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Feb 14 18:11:45 2019 +0100

    move pngwrite/pngread to vcl/filter/png
    
    Change-Id: Ib6bf092854208eea5257c357850213815639968c
    Reviewed-on: https://gerrit.libreoffice.org/67821
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9ddb06f9e255..9e104cf16bbd 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -18005,6 +18005,8 @@ vcl/source/filter/jpeg/jpegc.cxx
 vcl/source/filter/jpeg/jpegcomp.h
 vcl/source/filter/jpeg/transupp.c
 vcl/source/filter/jpeg/transupp.h
+vcl/source/filter/png/pngread.cxx
+vcl/source/filter/png/pngwrite.cxx
 vcl/source/filter/wmf/emfwr.cxx
 vcl/source/filter/wmf/emfwr.hxx
 vcl/source/filter/wmf/wmf.cxx
@@ -18071,8 +18073,6 @@ vcl/source/gdi/pdfwriter.cxx
 vcl/source/gdi/pdfwriter_impl.cxx
 vcl/source/gdi/pdfwriter_impl.hxx
 vcl/source/gdi/pdfwriter_impl2.cxx
-vcl/source/gdi/pngread.cxx
-vcl/source/gdi/pngwrite.cxx
 vcl/source/gdi/print.cxx
 vcl/source/gdi/print2.cxx
 vcl/source/gdi/print3.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0178ffc809df..73ea0e78e1a3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -284,8 +284,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/gdi/pdfwriter \
     vcl/source/gdi/pdfwriter_impl2 \
     vcl/source/gdi/pdfwriter_impl \
-    vcl/source/gdi/pngread \
-    vcl/source/gdi/pngwrite \
     vcl/source/gdi/print2 \
     vcl/source/gdi/print3 \
     vcl/source/gdi/print \
@@ -409,6 +407,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/filter/wmf/wmfexternal \
     vcl/source/filter/wmf/wmfwr \
     vcl/source/filter/png/PngImageReader \
+    vcl/source/filter/png/pngread \
+    vcl/source/filter/png/pngwrite \
     vcl/source/font/Feature \
     vcl/source/font/FeatureCollector \
     vcl/source/font/FeatureParser \
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/filter/png/pngread.cxx
similarity index 100%
rename from vcl/source/gdi/pngread.cxx
rename to vcl/source/filter/png/pngread.cxx
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/filter/png/pngwrite.cxx
similarity index 100%
rename from vcl/source/gdi/pngwrite.cxx
rename to vcl/source/filter/png/pngwrite.cxx