diff options
Diffstat (limited to 'source/blender/freestyle/intern/image')
5 files changed, 24 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp index 955d3bffef0..9d0a6a00b44 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.cpp +++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp @@ -29,6 +29,8 @@ #include "GaussianFilter.h" +namespace Freestyle { + GaussianFilter::GaussianFilter(float iSigma) { _sigma = iSigma; @@ -103,3 +105,5 @@ void GaussianFilter::computeMask() } } } + +} /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index 82007dba1d1..b300ec00989 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -33,6 +33,12 @@ #include "../system/FreestyleConfig.h" +extern "C" { +#include "BLI_math.h" +} + +namespace Freestyle { + class LIB_IMAGE_EXPORT GaussianFilter { protected: @@ -119,8 +125,6 @@ protected: */ -#include <math.h> - #ifdef __MACH__ # define sqrtf(x) (sqrt(x)) #endif @@ -152,4 +156,6 @@ float GaussianFilter::getSmoothedPixel(Map *map, int x, int y) return L; } +} /* namespace Freestyle */ + #endif // __GAUSSIANFILTER_H__ diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h index 6eb0ad07967..e4a8e3f9041 100644 --- a/source/blender/freestyle/intern/image/Image.h +++ b/source/blender/freestyle/intern/image/Image.h @@ -30,6 +30,8 @@ #include <string.h> // for memcpy +namespace Freestyle { + // // Image base class, for all types of images // @@ -405,4 +407,6 @@ protected: float *_lvl; }; +} /* namespace Freestyle */ + #endif // __IMAGE_H__ diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp index e2a5a782895..251f47bc44c 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.cpp +++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp @@ -33,6 +33,8 @@ using namespace std; +namespace Freestyle { + #if 0 ImagePyramid::ImagePyramid(const GrayImage& level0, unsigned nbLevels) { @@ -183,3 +185,5 @@ void GaussianPyramid::BuildPyramid(GrayImage *level0, unsigned nbLevels) } } } + +} /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index c8989778619..c3f3f63e4e7 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h @@ -32,6 +32,8 @@ #include "../system/FreestyleConfig.h" +namespace Freestyle { + class GrayImage; class LIB_IMAGE_EXPORT ImagePyramid @@ -106,4 +108,6 @@ public: /* modifiers */ }; +} /* namespace Freestyle */ + #endif // __IMAGEPYRAMID_H__ |