diff options
author | David Tardon <dtardon@redhat.com> | 2017-12-27 16:44:54 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2017-12-27 16:46:52 +0100 |
commit | bbad69894708f6718ee454443e1189d276cdd73d (patch) | |
tree | 00fd07280b7b0997bf80428c97db1bf382ea4f07 | |
parent | 7b3b5a1c3c2b2dd95092fdac51e1a4a5cab8fbc9 (diff) |
one def. of M_PI is enough
Change-Id: I8d6a4bfcca970dc0bd906f5e349ffaca25b96f96
-rw-r--r-- | src/lib/MSPUBCollector.cpp | 4 | ||||
-rw-r--r-- | src/lib/PolygonUtils.cpp | 4 | ||||
-rw-r--r-- | src/lib/libmspub_utils.cpp | 5 | ||||
-rw-r--r-- | src/lib/libmspub_utils.h | 5 |
4 files changed, 5 insertions, 13 deletions
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp index 8493cec..1ccd15e 100644 --- a/src/lib/MSPUBCollector.cpp +++ b/src/lib/MSPUBCollector.cpp @@ -364,10 +364,6 @@ void MSPUBCollector::setNextPage(unsigned pageSeqNum) m_pageSeqNumsOrdered.push_back(pageSeqNum); } -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - MSPUBCollector::MSPUBCollector(librevenge::RVNGDrawingInterface *painter) : m_painter(painter), m_contentChunkReferences(), m_width(0), m_height(0), m_widthSet(false), m_heightSet(false), diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp index 7452c36..bb7ffce 100644 --- a/src/lib/PolygonUtils.cpp +++ b/src/lib/PolygonUtils.cpp @@ -19,10 +19,6 @@ #define CALCULATED_VALUE(val) (int(unsigned(val) | 0x80000000)) -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - namespace libmspub { diff --git a/src/lib/libmspub_utils.cpp b/src/lib/libmspub_utils.cpp index 066ee2f..ba34cc5 100644 --- a/src/lib/libmspub_utils.cpp +++ b/src/lib/libmspub_utils.cpp @@ -11,7 +11,6 @@ #include <cstdarg> #include <cstring> -#include <math.h> #include <string.h> // for memcpy #include <unicode/ucnv.h> @@ -19,10 +18,6 @@ #include <zlib.h> -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - #define ZLIB_CHUNK 16384 namespace libmspub diff --git a/src/lib/libmspub_utils.h b/src/lib/libmspub_utils.h index deae5a6..dba757e 100644 --- a/src/lib/libmspub_utils.h +++ b/src/lib/libmspub_utils.h @@ -14,6 +14,7 @@ #include "config.h" #endif +#include <cmath> #include <map> #include <vector> @@ -25,6 +26,10 @@ #include "MSPUBTypes.h" +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + #if defined(HAVE_FUNC_ATTRIBUTE_FORMAT) # define MSPUB_ATTRIBUTE_PRINTF(fmt, arg) __attribute__((__format__(__printf__, fmt, arg))) #else |