Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Oct 17, 2012
1 parent bb3815f commit 4f1cac377a332936ebd778c175b0bb8c4f7791bc
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/core/qgis.h
  2. +1 −1 tests/src/core/testqgsatlascomposition.cpp
@@ -177,20 +177,20 @@ inline bool doubleNearSig( double a, double b, int significantDigits = 10 )
Works like C malloc() but prints debug message by QgsLogger if allocation fails.
@param size size in bytes
*/
void *QgsMalloc( size_t size );
void CORE_EXPORT *QgsMalloc( size_t size );

/** Allocates memory for an array of nmemb elements of size bytes each and returns
a pointer to the allocated memory. Works like C calloc() but prints debug message
by QgsLogger if allocation fails.
@param nmemb number of elements
@param size size of element in bytes
*/
void *QgsCalloc( size_t nmemb, size_t size );
void CORE_EXPORT *QgsCalloc( size_t nmemb, size_t size );

/** Frees the memory space pointed to by ptr. Works like C free().
@param ptr pointer to memory space
*/
void QgsFree( void *ptr );
void CORE_EXPORT QgsFree( void *ptr );

/** Wkt string that represents a geographic coord sys
* @note added in 1.8 to replace GEOWkt
@@ -161,7 +161,7 @@ void TestQgsAtlasComposition::filename()
void TestQgsAtlasComposition::autoscale_render()
{
mAtlas->setFixedScale( false );
mAtlas->setMargin( 0.10 );
mAtlas->setMargin( 0.10f );

mAtlas->beginRender();

0 comments on commit 4f1cac3

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