Add support for kml files.

[andy/viking.git] / src / mapcache.c

diff --git a/src/mapcache.c b/src/mapcache.c
index eded74a375a49d965e08fecfa12259a9205a8e79..5485f1789b719d9e08a8d6a4d0d0f85d47736217 100644 (file)
--- a/src/mapcache.c
+++ b/src/mapcache.c
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>

+#include "globals.h"

 #include "mapcache.h"
 #include "preferences.h"
 
 #include "mapcache.h"
 #include "preferences.h"
 


@@ -51,9 +52,6 @@ static GMutex *mc_mutex = NULL;
 #define HASHKEY_FORMAT_STRING "%d-%d-%d-%d-%d-%d-%.3f-%.3f"
 #define HASHKEY_FORMAT_STRING_NOSHRINK_NOR_ALPHA "%d-%d-%d-%d-%d-"
 
 #define HASHKEY_FORMAT_STRING "%d-%d-%d-%d-%d-%d-%.3f-%.3f"
 #define HASHKEY_FORMAT_STRING_NOSHRINK_NOR_ALPHA "%d-%d-%d-%d-%d-"
 

-#define VIKING_PREFERENCES_GROUP_KEY "viking.globals"
-#define VIKING_PREFERENCES_NAMESPACE "viking.globals."
-

 static VikLayerParamScale params_scales[] = {
   /* min, max, step, digits (decimal places) */
  { 1, 300, 1, 0 },
 static VikLayerParamScale params_scales[] = {
   /* min, max, step, digits (decimal places) */
  { 1, 300, 1, 0 },


@@ -154,7 +152,7 @@ void a_mapcache_add ( GdkPixbuf *pixbuf, gint x, gint y, gint z, guint8 type, gu
   }
   g_mutex_unlock(mc_mutex);
 
   }
   g_mutex_unlock(mc_mutex);
 

-  if ( (++tmp == 100 ))  { g_print("DEBUG: queue count=%d %u\n", queue_count, queue_size ); tmp=0; }
+  if ( (++tmp == 100 ))  { g_print("DEBUG: queue count=%d size=%u\n", queue_count, queue_size ); tmp=0; }

 }
 
 GdkPixbuf *a_mapcache_get ( gint x, gint y, gint z, guint8 type, guint zoom, guint8 alpha, gdouble xshrinkfactor, gdouble yshrinkfactor )
 }
 
 GdkPixbuf *a_mapcache_get ( gint x, gint y, gint z, guint8 type, guint zoom, guint8 alpha, gdouble xshrinkfactor, gdouble yshrinkfactor )