Merge branch 'maint'

diff --cc isl_mat.c
Simple merge

diff --cc isl_polynomial.c
index 737eb15,75908af..173c213
--- 1/isl_polynomial.c
--- 2/isl_polynomial.c
+++ b/isl_polynomial.c
@@@ -3896,11 -3771,13 +3896,13 @@@ __isl_give isl_qpolynomial *isl_qpolyno
                isl_upoly_free(subs[i]);
        free(subs);
  
-       mat = isl_mat_diagonal(isl_mat_identity(ctx, 1), isl_mat_copy(morph->inv));
-       mat = isl_mat_diagonal(mat, isl_mat_identity(ctx, qp->div->n_row));
+       diag = isl_mat_diag(ctx, 1, morph->inv->row[0][0]);
+       mat = isl_mat_diagonal(diag, isl_mat_copy(morph->inv));
+       diag = isl_mat_diag(ctx, qp->div->n_row, morph->inv->row[0][0]);
+       mat = isl_mat_diagonal(mat, diag);
        qp->div = isl_mat_product(qp->div, mat);
 -      isl_dim_free(qp->dim);
 -      qp->dim = isl_dim_copy(morph->ran->dim);
 +      isl_space_free(qp->dim);
 +      qp->dim = isl_space_copy(morph->ran->dim);
  
        if (!qp->upoly || !qp->div || !qp->dim)
                goto error;

diff --cc isl_tab_pip.c
Simple merge