Merge branch 'maint'

[platform/upstream/isl.git] / polytope_scan.c

diff --git a/polytope_scan.c b/polytope_scan.c
index 41983aa..ac87655 100644 (file)
--- a/polytope_scan.c
+++ b/polytope_scan.c
@@ -9,8 +9,10 @@
 
 #include <assert.h>
 #include "isl_equalities.h"
-#include "isl_seq.h"
+#include <isl/seq.h>
 #include "isl_scan.h"
+#include <isl_mat_private.h>
+#include <isl_map_private.h>
 
 /* The input of this program is the same as that of the "polytope_scan"
  * program from the barvinok distribution.
@@ -47,12 +49,14 @@ error:
 
 static struct isl_mat *isl_basic_set_scan_samples(struct isl_basic_set *bset)
 {
+       isl_ctx *ctx;
        unsigned dim;
        struct scan_samples ss;
 
+       ctx = isl_basic_set_get_ctx(bset);
        dim = isl_basic_set_total_dim(bset);
        ss.callback.add = scan_samples_add_sample;
-       ss.samples = isl_mat_alloc(bset->ctx, 0, 1 + dim);
+       ss.samples = isl_mat_alloc(ctx, 0, 1 + dim);
        if (!ss.samples)
                goto error;
 
@@ -72,6 +76,9 @@ static struct isl_mat *isl_basic_set_samples(struct isl_basic_set *bset)
        struct isl_mat *T;
        struct isl_mat *samples;
 
+       if (!bset)
+               return NULL;
+
        if (bset->n_eq == 0)
                return isl_basic_set_scan_samples(bset);