Skip to content

Commit 4f1cac3

Browse files
committed
fix windows build
1 parent bb3815f commit 4f1cac3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/core/qgis.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,20 @@ inline bool doubleNearSig( double a, double b, int significantDigits = 10 )
177177
Works like C malloc() but prints debug message by QgsLogger if allocation fails.
178178
@param size size in bytes
179179
*/
180-
void *QgsMalloc( size_t size );
180+
void CORE_EXPORT *QgsMalloc( size_t size );
181181

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

190190
/** Frees the memory space pointed to by ptr. Works like C free().
191191
@param ptr pointer to memory space
192192
*/
193-
void QgsFree( void *ptr );
193+
void CORE_EXPORT QgsFree( void *ptr );
194194

195195
/** Wkt string that represents a geographic coord sys
196196
* @note added in 1.8 to replace GEOWkt

tests/src/core/testqgsatlascomposition.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void TestQgsAtlasComposition::filename()
161161
void TestQgsAtlasComposition::autoscale_render()
162162
{
163163
mAtlas->setFixedScale( false );
164-
mAtlas->setMargin( 0.10 );
164+
mAtlas->setMargin( 0.10f );
165165

166166
mAtlas->beginRender();
167167

0 commit comments

Comments
 (0)