[Libreoffice-commits] core.git: basegfx/inc basegfx/Library_basegfx.mk basegfx/source

[David Ostrovsky]

 basegfx/Library_basegfx.mk           |    1 
 basegfx/inc/basegfx/pixel/bpixel.hxx |    3 ++
 basegfx/source/pixel/bpixel.cxx      |   39 +++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

New commits:
commit 67942a8b68f8061f4bbeda023be9a586e636128f
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Mar 4 22:18:20 2013 +0100

    fix build
    
    Windows seems to be unhappy about bpixel.cxx removal.
    This partially reverts 3abfdd08caf588577c349f1e2cbe8778ec228c85.
    
    Change-Id: I3a27bafa9ead14ba19d0f00a6be086df6c468e19

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 21cfff6..303d437 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
     basegfx/source/matrix/b2dhommatrixtools \
     basegfx/source/matrix/b3dhommatrix \
     basegfx/source/numeric/ftools \
+    basegfx/source/pixel/bpixel \
     basegfx/source/point/b2dpoint \
     basegfx/source/point/b2ipoint \
     basegfx/source/point/b3dpoint \
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
index 09f0fea..a2c5910 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/basegfx/inc/basegfx/pixel/bpixel.hxx
@@ -125,6 +125,9 @@ namespace basegfx
         {
             return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue);
         }
+
+        // empty element
+        static const BPixel& getEmptyBPixel();
     };
 
     //////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
new file mode 100644
index 0000000..579b8cb
--- /dev/null
+++ b/basegfx/source/pixel/bpixel.cxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <basegfx/pixel/bpixel.hxx>
+#include <rtl/instance.hxx>
+
+namespace { struct EmptyBPixel : public rtl::Static<basegfx::BPixel, EmptyBPixel> {}; }
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    const BPixel& BPixel::getEmptyBPixel()
+    {
+        return EmptyBPixel::get();
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // external operators
+
+} // end of namespace basegfx
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */