From d5f9123c308ed91525a5099819f111a5c03b55d5 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Mon, 16 Jun 2008 13:13:48 +0000
Subject: INTEGRATION: CWS hr51 (1.31.6); FILE MERGED 2008/06/06 14:36:04 hr
 1.31.6.1: #i88947#: Solaris 64 bit support

---
 basebmp/source/bitmapdevice.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 405cf07b6b44..1a013334b043 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: bitmapdevice.cxx,v $
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,6 +28,10 @@
  *
  ************************************************************************/
 
+// FIXME: in vigra
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x580)
+#include <math.h> // needed for fabs, hypot
+#endif
 #include "basebmp/bitmapdevice.hxx"
 
 #include "basebmp/compositeiterator.hxx"
@@ -75,8 +79,10 @@
 #include <vigra/copyimage.hxx>
 #include <vigra/tuple.hxx>
 
+
 namespace vigra
 {
+
 /// componentwise xor of an RGBValue (missing from rgbvalue.hxx)
 template< class Value, unsigned int RedIndex, unsigned int BlueIndex, unsigned int GreenIndex >
 inline RGBValue<Value, RedIndex, GreenIndex, BlueIndex>
-- 
cgit v1.2.3