diff options
Diffstat (limited to 'src/trace/siox.h')
| -rw-r--r-- | src/trace/siox.h | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/trace/siox.h b/src/trace/siox.h index 6b7256fe0..9a44ce1cf 100644 --- a/src/trace/siox.h +++ b/src/trace/siox.h @@ -1,6 +1,6 @@ -#ifndef __SIOX_H__ -#define __SIOX_H__ -/** +#ifndef SEEN_SIOX_H +#define SEEN_SIOX_H +/* * Copyright 2005, 2006 by Gerald Friedland, Kristian Jantz and Lars Knipping * * Conversion to C++ for Inkscape by Bob Jamison @@ -18,7 +18,7 @@ * limitations under the License. */ -/** +/* * Note by Bob Jamison: * After translating the siox.org Java API to C++ and receiving an * education into this wonderful code, I began again, @@ -316,7 +316,7 @@ public: /** * Saves this image as a simple color PPM */ - bool writePPM(const std::string fileName); + bool writePPM(const std::string &fileName); @@ -508,11 +508,6 @@ private: bool keepGoing; /** - * Our signature limits - */ - float limits[3]; - - /** * Image width */ unsigned int width; @@ -544,6 +539,11 @@ private: /** + * Our signature limits + */ + float limits[3]; + + /** * Maximum distance of two lab values. */ float clusterSize; @@ -649,9 +649,6 @@ private: */ float sqrEuclidianDist(float *p, int pSize, float *q); - - - }; @@ -660,10 +657,7 @@ private: } // namespace siox } // namespace org -#endif /* __SIOX_H__ */ +#endif // SEEN_SIOX_H //######################################################################## //# E N D O F F I L E //######################################################################## - - - |