Skip to content
Permalink
Browse files
fix gcc 4.7 warnings/errors
  • Loading branch information
jef-n committed Mar 31, 2012
1 parent 34f10f1 commit c29fb5a986f200794e889c0512cfaa0451604838
Showing with 9 additions and 6 deletions.
  1. +1 −0 src/app/main.cpp
  2. +2 −0 src/core/symbology-ng/qgssymbollayerv2registry.h
  3. +6 −6 src/plugins/georeferencer/qgsleastsquares.cpp
@@ -75,6 +75,7 @@ typedef SInt32 SRefCon;
#include "qgslogger.h"

#if defined(linux) && ! defined(ANDROID)
#include <unistd.h>
#include <execinfo.h>
#endif

@@ -19,6 +19,8 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata
QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type )
: mName( name ), mVisibleName( visibleName ), mType( type ) {}

virtual ~QgsSymbolLayerV2AbstractMetadata() {}

QString name() const { return mName; }
QString visibleName() const { return mVisibleName; }
QgsSymbolV2::SymbolType type() const { return mType; }
@@ -94,10 +94,10 @@ void QgsLeastSquares::helmert( std::vector<QgsPoint> mapCoords,
that this is correct but I derived it myself late at night. Look at
helmert.jpg if you suspect bugs. */

double MData[] = { A, -B, n, 0,
B, A, 0, n,
G + H, 0, A, B,
0, G + H, -B, A
double MData[] = { A, -B, ( double ) n, 0.,
B, A, 0., ( double ) n,
G + H, 0., A, B,
0., G + H, -B, A
};

double bData[] = { C, D, E + F, J - I };
@@ -151,8 +151,8 @@ void QgsLeastSquares::affine( std::vector<QgsPoint> mapCoords,
I *think* that this is correct but I derived it myself late at night.
Look at affine.jpg if you suspect bugs. */

double MData[] = { A, B, 0, 0, n, 0,
0, 0, A, B, 0, n,
double MData[] = { A, B, 0, 0, ( double ) n, 0,
0, 0, A, B, 0, ( double ) n,
E, G, 0, 0, A, 0,
G, F, 0, 0, B, 0,
0, 0, E, G, 0, A,

0 comments on commit c29fb5a

Please sign in to comment.