Skip to content

Commit

Permalink
fix Pal::registerCancellationCallback spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Feb 24, 2019
1 parent 3711763 commit 918f5f3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/pal/pal.cpp
Expand Up @@ -441,7 +441,7 @@ std::unique_ptr<Problem> Pal::extract( const QgsRectangle &extent, const QgsGeom
return prob;
}

void Pal::registerCancelationCallback( Pal::FnIsCanceled fnCanceled, void *context )
void Pal::registerCancellationCallback( Pal::FnIsCanceled fnCanceled, void *context )
{
fnIsCanceled = fnCanceled;
fnIsCanceledContext = context;
Expand Down
2 changes: 1 addition & 1 deletion src/core/pal/pal.h
Expand Up @@ -129,7 +129,7 @@ namespace pal
typedef bool ( *FnIsCanceled )( void *ctx );

//! Register a function that returns whether this job has been canceled - PAL calls it during the computation
void registerCancelationCallback( FnIsCanceled fnCanceled, void *context );
void registerCancellationCallback( FnIsCanceled fnCanceled, void *context );

//! Check whether the job has been canceled
inline bool isCanceled() { return fnIsCanceled ? fnIsCanceled( fnIsCanceledContext ) : false; }
Expand Down
3 changes: 1 addition & 2 deletions src/core/qgslabelingengine.cpp
Expand Up @@ -283,8 +283,7 @@ void QgsLabelingEngine::run( QgsRenderContext &context )

QgsRectangle extent = extentGeom.boundingBox();


p.registerCancelationCallback( &_palIsCanceled, reinterpret_cast< void * >( &context ) );
p.registerCancellationCallback( &_palIsCanceled, reinterpret_cast< void * >( &context ) );

QTime t;
t.start();
Expand Down

0 comments on commit 918f5f3

Please sign in to comment.