Merge branch 'release' into develop

@@ -124,6 +124,9 @@
     {
     {
         RMLog(@"Opening db map source %@", path);
         RMLog(@"Opening db map source %@", path);
 
 
+        // Debug mode
+//        [db setTraceExecution:YES];
+
         // get the tile side length
         // get the tile side length
         tileSideLength = [self getPreferenceAsInt:kTileSideLengthKey];
         tileSideLength = [self getPreferenceAsInt:kTileSideLengthKey];
 
 
@@ -189,22 +192,25 @@
 
 
 - (UIImage *)imageForTileImage:(RMTileImage *)tileImage addToCache:(RMTileCache *)tileCache withCacheKey:(NSString *)aCacheKey
 - (UIImage *)imageForTileImage:(RMTileImage *)tileImage addToCache:(RMTileCache *)tileCache withCacheKey:(NSString *)aCacheKey
 {
 {
+    UIImage *image = nil;
+
 	RMTile tile = [[self mercatorToTileProjection] normaliseTile:tileImage.tile];
 	RMTile tile = [[self mercatorToTileProjection] normaliseTile:tileImage.tile];
 
 
     // get the unique key for the tile
     // get the unique key for the tile
     NSNumber *key = [NSNumber numberWithLongLong:RMTileKey(tile)];
     NSNumber *key = [NSNumber numberWithLongLong:RMTileKey(tile)];
 
 
+    @synchronized(db) {
         // fetch the image from the db
         // fetch the image from the db
         FMResultSet *result = [db executeQuery:@"SELECT image FROM tiles WHERE tilekey = ?", key];
         FMResultSet *result = [db executeQuery:@"SELECT image FROM tiles WHERE tilekey = ?", key];
         FMDBErrorCheck(db);
         FMDBErrorCheck(db);
 
 
-    UIImage *image = nil;
         if ([result next]) {
         if ([result next]) {
-        image = [[[UIImage alloc] initWithData:[result dataForColumn:@"image"]] autorelease];
+            image = [[[UIImage alloc] initWithData:[result dataForColumnIndex:0]] autorelease];
         } else {
         } else {
             image = [RMTileImage missingTile];
             image = [RMTileImage missingTile];
         }
         }
         [result close];
         [result close];
+    }
 
 
     if (tileCache)
     if (tileCache)
         [tileCache addImage:image forTile:tile withCacheKey:aCacheKey];
         [tileCache addImage:image forTile:tile withCacheKey:aCacheKey];
@@ -258,11 +264,13 @@
 {
 {
 	NSString* value = nil;
 	NSString* value = nil;
 
 
+    @synchronized(db) {
         FMResultSet *result = [db executeQuery:@"select value from preferences where name = ?", name];
         FMResultSet *result = [db executeQuery:@"select value from preferences where name = ?", name];
         if ([result next]) {
         if ([result next]) {
             value = [result stringForColumn:@"value"];
             value = [result stringForColumn:@"value"];
         }
         }
         [result close];
         [result close];
+    }
 
 
 	return value;
 	return value;
 }
 }