summaryrefslogtreecommitdiff
path: root/backend/gt68xx_high.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:55 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:55 +0200
commita77bc1fcbdf83cfdac9570c0a0ac886b5534c90f (patch)
treed839746371ecb8ed64ac81d2e37c11fcd25a00ac /backend/gt68xx_high.c
parent787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff)
parent2b3e02411ecc09e7d41741b5587655c9b2f955b7 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/gt68xx_high.c')
-rw-r--r--backend/gt68xx_high.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/gt68xx_high.c b/backend/gt68xx_high.c
index 782b4f3..563323c 100644
--- a/backend/gt68xx_high.c
+++ b/backend/gt68xx_high.c
@@ -97,7 +97,7 @@ gt68xx_calibrator_new (SANE_Int width,
cal->white_line = (double *) malloc (width * sizeof (double));
cal->black_line = (double *) malloc (width * sizeof (double));
- if (!cal->k_white || !cal->k_black | !cal->white_line || !cal->black_line)
+ if (!cal->k_white || !cal->k_black || !cal->white_line || !cal->black_line)
{
DBG (5, "gt68xx_calibrator_new: no memory for calibration data\n");
gt68xx_calibrator_free (cal);