Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Jul 3, 2011
1 parent 71443b1 commit 8eb7664b212a62fcf6e19e2d546f8586eb1edd95
Showing with 4 additions and 4 deletions.
  1. 0 src/app/qgsfieldcalculator.cpp
  2. +4 −4 src/core/symbology-ng/qgssvgcache.h
0 src/app/qgsfieldcalculator.cpp 100755 → 100644
No changes.
@@ -27,7 +27,7 @@ class QDomElement;
class QImage;
class QPicture;

struct QgsSvgCacheEntry
struct CORE_EXPORT QgsSvgCacheEntry
{
QgsSvgCacheEntry();
QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFctor, const QColor& fill, const QColor& outline );
@@ -58,7 +58,7 @@ struct QgsSvgCacheEntry
/**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are
the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. <circle fill="param(fill-color red)" stroke="param(pen-color black)" stroke-width="param(outline-width 1)"*/
class QgsSvgCache
class CORE_EXPORT QgsSvgCache
{
public:

@@ -73,7 +73,7 @@ class QgsSvgCache
/**Tests if an svg file contains parameters for fill, outline color, outline width. If yes, possible default values are returned. If there are several
default values in the svg file, only the first one is considered*/
void containsParams( const QString& path, bool& hasFillParam, QColor& defaultFillColor, bool& hasOutlineParam, QColor& defaultOutlineColor, bool& hasOutlineWidthParam,
double& defaultOutlineWidth ) const;
double& defaultOutlineWidth ) const;

protected:
QgsSvgCache();
@@ -115,7 +115,7 @@ class QgsSvgCache
void replaceElemParams( QDomElement& elem, const QColor& fill, const QColor& outline, double outlineWidth );

void containsElemParams( const QDomElement& elem, bool& hasFillParam, QColor& defaultFill, bool& hasOutlineParam, QColor& defaultOutline,
bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const;
bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const;

/**Release memory and remove cache entry from mEntryLookup*/
void removeCacheEntry( QString s, QgsSvgCacheEntry* entry );

0 comments on commit 8eb7664

Please sign in to comment.
You can’t perform that action at this time.