Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-07-10 03:16:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-10 03:16:39 +0400
commit4563d1103d95cd1259c8f7c6370b6d929871a575 (patch)
tree9371d9d2b58d2f649be046e34d7dabcc361baf33 /intern/raskter
parent0b1d5d42cfc544d659d39ab7ff58e723b11bf858 (diff)
fix warnings/errors in recent raster commit.
Diffstat (limited to 'intern/raskter')
-rw-r--r--intern/raskter/raskter.c2
-rw-r--r--intern/raskter/raskter.h2
-rw-r--r--intern/raskter/raskter_mt.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index 825287ffe86..a5fb0c4b118 100644
--- 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 676bb56a2ae..004085d23c7 100644
--- 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 0b8f8c7c673..c323a2eaa12 100644
--- 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. */