fix warnings/errors in recent raster commit.

diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index 825287ffe86a4a8bec233b444b65716d5e89863a..a5fb0c4b118b943fccbf8a711fa4bd5600094144 100644 (file)
--- a/intern/raskter/raskter.c
+++ b/intern/raskter/raskter.c
@@ -46,7 +46,7 @@
  * just the poly. Since the DEM code could end up being coupled with this, we'll keep it separate
  * for now.
  */
-static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge) {
+void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge) {
     int i;
     int xbeg;
     int ybeg;

diff --git a/intern/raskter/raskter.h b/intern/raskter/raskter.h
index 676bb56a2aea6872a9e214efaa37c36405c5af39..004085d23c77a5f2b14e8c1382f31f50fd46d4a5 100644 (file)
--- a/intern/raskter/raskter.h
+++ b/intern/raskter/raskter.h
@@ -84,7 +84,7 @@ struct r_fill_context {
 extern "C" {
 #endif
 
-static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge);
+void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge);
 int PLX_raskterize(float (*base_verts)[2], int num_base_verts,
                    float *buf, int buf_x, int buf_y, int do_mask_AA);
 int PLX_raskterize_feather(float (*base_verts)[2], int num_base_verts,

diff --git a/intern/raskter/raskter_mt.c b/intern/raskter/raskter_mt.c
index 0b8f8c7c673fbc712462da28ad319270bca61d8e..c323a2eaa1222fc11b9860e6b06f2808a05af4a9 100644 (file)
--- a/intern/raskter/raskter_mt.c
+++ b/intern/raskter/raskter_mt.c
@@ -266,7 +266,7 @@ static int rast_scan_init(struct r_fill_context *ctx, struct poly_vert *verts, i
     return 1;
 }
 
-static void init_base_data(float(*base_verts)[2], int num_base_verts,
+/* static */ int init_base_data(float(*base_verts)[2], int num_base_verts,
                    float *buf, int buf_x, int buf_y) {
     int i;                                   /* i: Loop counter. */
     struct poly_vert *ply;                   /* ply: Pointer to a list of integer buffer-space vertex coordinates. */