Changed inline functions of QgsMapToPixel to normal functions.

wonder · wonder · commit 0766775366d1 · 2007-02-22T11:45:34.000Z
This fixes warnings on windows when calling them outside core lib. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6655 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
@@ -20,6 +20,22 @@
 #include <qpoint.h>
 #include "qgsmaptopixel.h"
 
+QgsMapToPixel::QgsMapToPixel(double mupp, 
+				    double ymax,
+				    double ymin, 
+				    double xmin)
+  : mMapUnitsPerPixel(mupp), 
+     yMax(ymax), 
+     yMin(ymin), 
+     xMin(xmin),
+     xMax(0)                   // XXX wasn't originally specified?  Why?
+{
+}
+
+QgsMapToPixel::~QgsMapToPixel()
+{
+}
+
 QgsPoint QgsMapToPixel::toMapPoint(int x, int y)
 {
   double mx = x * mMapUnitsPerPixel + xMin;
@@ -80,3 +96,46 @@ QString QgsMapToPixel::showParameters()
   return rep;
 
 }
+
+
+QgsPoint QgsMapToPixel::transform(double x, double y)
+{
+  transformInPlace(x,y);
+  return QgsPoint(x,y);
+}
+
+QgsPoint QgsMapToPixel::transform(const QgsPoint& p)
+{
+  double dx = p.x();
+  double dy = p.y();
+  transformInPlace(dx, dy);
+
+  //std::cerr << "Point to pixel...X : " << p.x() << "-->" << dx << ", Y: " << p.y() << " -->" << dy << std::endl;
+  return QgsPoint(dx, dy);
+}
+
+void QgsMapToPixel::transform(QgsPoint* p)
+{   
+  double x = p->x();
+  double y = p->y();
+  transformInPlace(x, y);
+
+#ifdef QGISDEBUG 
+    //std::cerr << "Point to pixel...X : " << p->x() << "-->" << x << ", Y: " << p->y() << " -->" << y << std::endl;
+#endif     
+  p->set(x,y);
+}
+
+void QgsMapToPixel::transformInPlace(double& x, double& y)
+{
+  x = (x - xMin) / mMapUnitsPerPixel;
+  y = yMax - (y - yMin) / mMapUnitsPerPixel;
+}
+
+void QgsMapToPixel::transformInPlace(std::vector<double>& x, 
+					    std::vector<double>& y)
+{
+  assert(x.size() == y.size());
+  for (unsigned int i = 0; i < x.size(); ++i)
+    transformInPlace(x[i], y[i]);
+}
diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
@@ -114,61 +114,5 @@ class CORE_EXPORT QgsMapToPixel{
 
 };
 
-inline QgsMapToPixel::QgsMapToPixel(double mupp, 
-				    double ymax,
-				    double ymin, 
-				    double xmin)
-  : mMapUnitsPerPixel(mupp), 
-     yMax(ymax), 
-     yMin(ymin), 
-     xMin(xmin),
-     xMax(0)                   // XXX wasn't originally specified?  Why?
-{
-}
 
-inline QgsMapToPixel::~QgsMapToPixel()
-{
-}
-
-inline QgsPoint QgsMapToPixel::transform(double x, double y)
-{
-  transformInPlace(x,y);
-  return QgsPoint(x,y);
-}
-
-inline QgsPoint QgsMapToPixel::transform(const QgsPoint& p)
-{
-  double dx = p.x();
-  double dy = p.y();
-  transformInPlace(dx, dy);
-
-  //std::cerr << "Point to pixel...X : " << p.x() << "-->" << dx << ", Y: " << p.y() << " -->" << dy << std::endl;
-  return QgsPoint(dx, dy);
-}
-
-inline void QgsMapToPixel::transform(QgsPoint* p)
-{   
-  double x = p->x();
-  double y = p->y();
-  transformInPlace(x, y);
-
-#ifdef QGISDEBUG 
-    //std::cerr << "Point to pixel...X : " << p->x() << "-->" << x << ", Y: " << p->y() << " -->" << y << std::endl;
-#endif     
-  p->set(x,y);
-}
-
-inline void QgsMapToPixel::transformInPlace(double& x, double& y)
-{
-  x = (x - xMin) / mMapUnitsPerPixel;
-  y = yMax - (y - yMin) / mMapUnitsPerPixel;
-}
-
-inline void QgsMapToPixel::transformInPlace(std::vector<double>& x, 
-					    std::vector<double>& y)
-{
-  assert(x.size() == y.size());
-  for (unsigned int i = 0; i < x.size(); ++i)
-    transformInPlace(x[i], y[i]);
-}
 #endif // QGSMAPTOPIXEL
