[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master 71610b9 7/7: Merged fix to bug #48603
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master 71610b9 7/7: Merged fix to bug #48603 |
Date: |
Sat, 23 Jul 2016 16:06:50 +0000 (UTC) |
branch: master
commit 71610b93696b2547acf27f80ddeeae716d5157ac
Merge: 89dd04b 70e7da4
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Merged fix to bug #48603
Since the bug description is more clear than the commit message of the fix,
it is being included here for more clarity:
"The part of condition after checking p->up.matrixname is always true. But,
according to error text it should fail only if the matrix is not square or any
of its side does not equal 2 or 3."
This fixes bug #48603.
---
src/imgwarp/ui.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/imgwarp/ui.c b/src/imgwarp/ui.c
index 0a48af9..e6d5a18 100644
--- a/src/imgwarp/ui.c
+++ b/src/imgwarp/ui.c
@@ -330,7 +330,7 @@ sanitycheck(struct imgwarpparams *p)
/* Check the size of the input matrix, note that it might only have
the wrong numbers when it is read from a file. */
if(p->up.matrixname
- && (p->ms0!=2 || p->ms0!=3 || p->ms1!=2 || p->ms1!=3))
+ && (p->ms0!=2 && p->ms0!=3 || p->ms0!=p->ms1))
error(EXIT_FAILURE, 0, "the given matrix in %s has %lu rows and %lu "
"columns. Its size must be either 2x2 or 3x3", p->up.matrixname,
p->ms0, p->ms1);
- [gnuastro-commits] master updated (4e2e9cb -> 71610b9), Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 70e7da4 2/7: function sanitycheck inside ui.c will fail always if matrixname is not NULL, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master f5c447d 4/7: Wrong 755 permissions for two .conf files, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 2e3abf8 3/7: fix error messages in imgcrop, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 89dd04b 6/7: Merged fix to bug #48516, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 634b601 5/7: Merged fix to bug 48453 in master, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 29e3269 1/7: bug 109074 - copy paste error in NoiseChisel, Mohammad Akhlaghi, 2016/07/23
- [gnuastro-commits] master 71610b9 7/7: Merged fix to bug #48603,
Mohammad Akhlaghi <=