fix warnings

propublica · May 19, 2014 · 44cf466 · 44cf466
1 parent bf73f5b
commit 44cf466
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/Rakefile b/Rakefile
@@ -29,7 +29,6 @@ task :publish do |t|
   `git checkout master`
 end
 
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

diff --git a/ext/simpler_tiles/map.c b/ext/simpler_tiles/map.c
@@ -1,6 +1,7 @@
 #include "map.h"
-#include "util.h"
+#include <simple-tiles/util.h>
 #include <simple-tiles/map.h>
+#include <simple-tiles/memory.h>
 #include <simple-tiles/vector_layer.h>
 #include <simple-tiles/raster_layer.h>
 #include <simple-tiles/bounds.h>
@@ -222,9 +223,9 @@ add_vector_layer(VALUE self, VALUE layer){
   simplet_map_t *map = get_map(self);
   simplet_vector_layer_t *lyr;
   Data_Get_Struct(layer, simplet_vector_layer_t, lyr);
-  simplet_map_add_layer_directly(map, lyr);
+  simplet_map_add_layer_directly(map, (simplet_layer_t *) lyr);
   VALUE circ_ref = self;
-  simplet_layer_set_user_data(lyr, (void *)circ_ref);
+  simplet_vector_layer_set_user_data(lyr, (void *)circ_ref);
   simplet_retain((simplet_retainable_t*) lyr);
   return layer;
 }
@@ -240,9 +241,9 @@ add_raster_layer(VALUE self, VALUE layer){
   simplet_map_t *map = get_map(self);
   simplet_raster_layer_t *lyr;
   Data_Get_Struct(layer, simplet_raster_layer_t, lyr);
-  simplet_map_add_layer_directly(map, lyr);
+  simplet_map_add_layer_directly(map, (simplet_layer_t *) lyr);
   VALUE circ_ref = self;
-  simplet_layer_set_user_data(lyr, (void *)circ_ref);
+  simplet_raster_layer_set_user_data(lyr, (void *)circ_ref);
   simplet_retain((simplet_retainable_t*) lyr);
   return layer;
 }

diff --git a/ext/simpler_tiles/query.c b/ext/simpler_tiles/query.c
@@ -1,6 +1,7 @@
 #include "query.h"
 #include <simple-tiles/query.h>
 #include <simple-tiles/style.h>
+#include <simple-tiles/memory.h>
 
 VALUE cSimplerTilesQuery;
 

diff --git a/ext/simpler_tiles/raster_layer.c b/ext/simpler_tiles/raster_layer.c
@@ -6,13 +6,6 @@
 
 VALUE cSimplerTilesRasterLayer;
 
-static simplet_raster_layer_t *
-get_layer(VALUE self){
-  simplet_raster_layer_t *layer;
-  Data_Get_Struct(self, simplet_raster_layer_t, layer);
-  return layer;
-}
-
 static void
 mark_layer(void *layer){
   simplet_raster_layer_t *lyr = layer;

diff --git a/ext/simpler_tiles/style.c b/ext/simpler_tiles/style.c
@@ -1,5 +1,5 @@
 #include "style.h"
-#include "util.h"
+#include <simple-tiles/util.h>
 #include <simple-tiles/style.h>
 
 VALUE cSimplerTilesStyle;

diff --git a/ext/simpler_tiles/vector_layer.c b/ext/simpler_tiles/vector_layer.c
@@ -15,6 +15,7 @@ get_layer(VALUE self){
   return layer;
 }
 
+
 static void
 mark_layer(void *layer){
   simplet_vector_layer_t *lyr = layer;
@@ -28,7 +29,6 @@ layer_free(void *layer){
   simplet_vector_layer_free(lyr);
 }
 
-
 /*
 Add a query object to this Layer's list of queries.