lib: Remove num_stripes from fpi_assemble_frames()

We never used a number of stripes that didn't match the length of the
list anyway.

Closes: #132

.ci/check-abi

@@ -1,113 +0,0 @@
-#!/usr/bin/python3
-
-
-import argparse
-import contextlib
-import os
-import shutil
-import subprocess
-import sys
-
-
-def format_title(title):
-    box = {
-        'tl': '╔', 'tr': '╗', 'bl': '╚', 'br': '╝', 'h': '═', 'v': '║',
-    }
-    hline = box['h'] * (len(title) + 2)
-
-    return '\n'.join([
-        f"{box['tl']}{hline}{box['tr']}",
-        f"{box['v']} {title} {box['v']}",
-        f"{box['bl']}{hline}{box['br']}",
-    ])
-
-
-def rm_rf(path):
-    try:
-        shutil.rmtree(path)
-    except FileNotFoundError:
-        pass
-
-
-def sanitize_path(name):
-    return name.replace('/', '-')
-
-
-def get_current_revision():
-    revision = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
-                                       encoding='utf-8').strip()
-
-    if revision == 'HEAD':
-        # This is a detached HEAD, get the commit hash
-        revision = subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip().decode('utf-8')
-
-    return revision
-
-
-@contextlib.contextmanager
-def checkout_git_revision(revision):
-    current_revision = get_current_revision()
-    subprocess.check_call(['git', 'checkout', '-q', revision])
-
-    try:
-        yield
-    finally:
-        subprocess.check_call(['git', 'checkout', '-q', current_revision])
-
-
-def build_install(revision):
-    build_dir = '_build'
-    dest_dir = os.path.abspath(sanitize_path(revision))
-    print(format_title(f'# Building and installing {revision} in {dest_dir}'),
-          end='\n\n', flush=True)
-
-    with checkout_git_revision(revision):
-        rm_rf(build_dir)
-        rm_rf(revision)
-
-        subprocess.check_call(['meson', build_dir,
-                               '--prefix=/usr', '--libdir=lib',
-                               '-Dx11-examples=false', '-Ddoc=false', '-Dgtk-examples=false'])
-        subprocess.check_call(['ninja', '-v', '-C', build_dir])
-        subprocess.check_call(['ninja', '-v', '-C', build_dir, 'install'],
-                              env={'DESTDIR': dest_dir})
-
-    return dest_dir
-
-
-def compare(old_tree, new_tree):
-    print(format_title(f'# Comparing the two ABIs'), end='\n\n', flush=True)
-
-    old_headers = os.path.join(old_tree, 'usr', 'include')
-    old_lib = os.path.join(old_tree, 'usr', 'lib', 'libfprint.so')
-
-    new_headers = os.path.join(new_tree, 'usr', 'include')
-    new_lib = os.path.join(new_tree, 'usr', 'lib', 'libfprint.so')
-
-    subprocess.check_call([
-        'abidiff', '--headers-dir1', old_headers, '--headers-dir2', new_headers,
-        '--drop-private-types', '--fail-no-debug-info', '--no-added-syms', old_lib, new_lib])
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('old', help='the previous revision, considered the reference')
-    parser.add_argument('new', help='the new revision, to compare to the reference')
-
-    args = parser.parse_args()
-
-    if args.old == args.new:
-        print("Let's not waste time comparing something to itself")
-        sys.exit(0)
-
-    old_tree = build_install(args.old)
-    new_tree = build_install(args.new)
-
-    try:
-        compare(old_tree, new_tree)
-
-    except Exception:
-        sys.exit(1)
-
-    print(f'Hurray! {args.old} and {args.new} are ABI-compatible!')

.gitlab-ci.yml

@@ -7,7 +7,6 @@ variables:
   DEPENDENCIES: libusb1-devel glib2-devel nss-devel pixman-devel systemd meson gtk-doc
                 gcc gcc-c++ glibc-devel libX11-devel libXv-devel gtk3-devel flatpak-builder
   BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
-  LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
 
 .build_one_driver_template: &build_one_driver
   script:
@@ -25,16 +24,10 @@ variables:
     - ninja -C _build
     - ninja -C _build install
 
-.build_template: &check_abi
-  script:
-    - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES doxygen libabigail git
-    - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
-
 build:
   stage: build
   <<: *build_one_driver
   <<: *build
-  <<: *check_abi
 
 .flatpak_script_template: &flatpak_script
     script:

NEWS

@@ -1,33 +1,6 @@
 This file lists notable changes in each release. For the full history of all
 changes, see ChangeLog.
 
-2019-08-08: v1.0 release
-* Library:
-  - Add guards to the public API and require GLib 2.50
-  - Deprecate print storage API
-  - Better documentation for fp_discover_devs()
-  - Remove unused internal fpi_timeout_cancel_for_dev()
-  - Remove state from fp_img_driver activate handler
-  - Bug fixes related to restarting a failed verification immediately
-
-* Drivers:
-  - The Elan driver received a lot of bug fixes including a fix for a
-    hang when verifying prints with fprintd, quirks for some devices,
-    a memory leak fix and support for 04f3:0c42
-  - Fix a probable crash in all the AES drivers
-  - Add support for Lenovo Preferred Pro Keyboard (KUF1256) to vfs5011
-  - Prevent hang during enroll process in etes603 driver
-  - Fix possible integer overflow in uru4000
-  - Work-around SELinux AVC warnings when uru4000 driver starts
-  - Remove long-unmaintained and broken fdu2000 driver
-
-* Tools/Examples:
-  - Fix examples not working due to an overly strict check
-  - Fix crash in GTK demo when there's no supported devices
-  - Disable GTK demo until we have a USB Flatpak portal
-  - Remove sleep() in enroll example which caused a crash in some drivers
-  - Add a simple storage implementation example
-
 2018-12-14: v0.99.0 release
 * Library:
   - All the internal API for device driver writers is now covered by the

libfprint/drivers/aes1610.c

@@ -611,8 +611,8 @@ static void capture_read_strip_cb(struct libusb_transfer *transfer)
 		/* send stop capture bits */
 		aes_write_regv(dev, capture_stop, G_N_ELEMENTS(capture_stop), stub_capture_stop_cb, NULL);
 		aesdev->strips = g_slist_reverse(aesdev->strips);
-		fpi_do_movement_estimation(&assembling_ctx, aesdev->strips, aesdev->strips_len);
-		img = fpi_assemble_frames(&assembling_ctx, aesdev->strips, aesdev->strips_len);
+		fpi_do_movement_estimation(&assembling_ctx, aesdev->strips);
+		img = fpi_assemble_frames(&assembling_ctx, aesdev->strips);
 		img->flags |= FP_IMG_PARTIAL;
 		g_slist_free_full(aesdev->strips, g_free);
 		aesdev->strips = NULL;

libfprint/drivers/aes2501.c

@@ -482,10 +482,8 @@ static void capture_read_strip_cb(struct libusb_transfer *transfer,
 			struct fp_img *img;
 
 			aesdev->strips = g_slist_reverse(aesdev->strips);
-			fpi_do_movement_estimation(&assembling_ctx,
-					aesdev->strips, aesdev->strips_len);
-			img = fpi_assemble_frames(&assembling_ctx,
-						  aesdev->strips, aesdev->strips_len);
+			fpi_do_movement_estimation(&assembling_ctx, aesdev->strips);
+			img = fpi_assemble_frames(&assembling_ctx, aesdev->strips);
 			img->flags |= FP_IMG_PARTIAL;
 			g_slist_free_full(aesdev->strips, g_free);
 			aesdev->strips = NULL;

libfprint/drivers/aes2550.c

@@ -244,8 +244,7 @@ static void capture_set_idle_reqs_cb(struct libusb_transfer *transfer)
 		struct fp_img *img;
 
 		aesdev->strips = g_slist_reverse(aesdev->strips);
-		img = fpi_assemble_frames(&assembling_ctx,
-					  aesdev->strips, aesdev->strips_len);
+		img = fpi_assemble_frames(&assembling_ctx, aesdev->strips);
 		img->flags |= FP_IMG_PARTIAL;
 		g_slist_free_full(aesdev->strips, g_free);
 		aesdev->strips = NULL;

libfprint/drivers/aeslib.c

@@ -53,15 +53,12 @@ static void write_regv_trf_complete(struct libusb_transfer *transfer)
 {
 	struct write_regv_data *wdata = transfer->user_data;
 
-	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
+	if (transfer->status != LIBUSB_TRANSFER_COMPLETED)
 		wdata->callback(wdata->imgdev, -EIO, wdata->user_data);
-		g_free(wdata);
-	} else if (transfer->length != transfer->actual_length) {
+	else if (transfer->length != transfer->actual_length)
 		wdata->callback(wdata->imgdev, -EPROTO, wdata->user_data);
-		g_free(wdata);
-	} else {
+	else
 		continue_write_regv(wdata);
-	}
 
 	g_free(transfer->buffer);
 	libusb_free_transfer(transfer);
@@ -112,7 +109,6 @@ static void continue_write_regv(struct write_regv_data *wdata)
 		if (offset >= wdata->num_regs) {
 			fp_dbg("all registers written");
 			wdata->callback(wdata->imgdev, 0, wdata->user_data);
-			g_free(wdata);
 			return;
 		}
 		if (wdata->regs[offset].reg)
@@ -136,7 +132,6 @@ static void continue_write_regv(struct write_regv_data *wdata)
 	r = do_write_regv(wdata, upper_bound);
 	if (r < 0) {
 		wdata->callback(wdata->imgdev, r, wdata->user_data);
-		g_free(wdata);
 		return;
 	}
 
@@ -160,6 +155,8 @@ void aes_write_regv(struct fp_img_dev *dev, const struct aes_regwrite *regs,
 	wdata->callback = callback;
 	wdata->user_data = user_data;
 	continue_write_regv(wdata);
+
+	g_free(wdata);
 }
 
 unsigned char aes_get_pixel(struct fpi_frame_asmbl_ctx *ctx,

libfprint/drivers/aesx660.c

@@ -305,7 +305,7 @@ static void capture_set_idle_cmd_cb(struct libusb_transfer *transfer)
 		struct fp_img *img;
 
 		aesdev->strips = g_slist_reverse(aesdev->strips);
-		img = fpi_assemble_frames(aesdev->assembling_ctx, aesdev->strips, aesdev->strips_len);
+		img = fpi_assemble_frames(aesdev->assembling_ctx, aesdev->strips);
 		img->flags |= aesdev->extra_img_flags;
 		g_slist_foreach(aesdev->strips, (GFunc) g_free, NULL);
 		g_slist_free(aesdev->strips);

libfprint/drivers/elan.c

@@ -307,8 +307,8 @@ static void elan_submit_image(struct fp_img_dev *dev)
 	assembling_ctx.frame_height = elandev->frame_height;
 	assembling_ctx.image_width = elandev->frame_width * 3 / 2;
 	g_slist_foreach(raw_frames, (GFunc) elandev->process_frame, &frames);
-	fpi_do_movement_estimation(&assembling_ctx, frames, num_frames);
-	img = fpi_assemble_frames(&assembling_ctx, frames, num_frames);
+	fpi_do_movement_estimation(&assembling_ctx, frames);
+	img = fpi_assemble_frames(&assembling_ctx, frames);
 
 	img->flags |= FP_IMG_PARTIAL;
 	fpi_imgdev_image_captured(dev, img);
@@ -424,8 +424,7 @@ elan_run_cmd(fpi_ssm               *ssm,
 		elandev->cmd_timeout = cmd_timeout;
 
 	if (cmd->devices != ELAN_ALL_DEV && !(cmd->devices & elandev->dev_type)) {
-		fp_dbg("skipping command 0x%x 0x%x for this device (for devices 0x%x but device is 0x%x)",
-		       cmd->cmd[0], cmd->cmd[1], cmd->devices, elandev->dev_type);
+		fp_dbg("skipping for this device");
 		elan_cmd_done(ssm);
 		return;
 	}

libfprint/drivers/vfs5011.c

@@ -371,7 +371,7 @@ static int process_chunk(struct vfs5011_data *data, int transferred)
 				VFS5011_IMAGE_WIDTH) >= DIFFERENCE_THRESHOLD)) {
 			data->lastline = g_malloc(VFS5011_LINE_SIZE);
 			data->rows = g_slist_prepend(data->rows, data->lastline);
-			memmove(data->lastline, linebuf, VFS5011_LINE_SIZE);
+			g_memmove(data->lastline, linebuf, VFS5011_LINE_SIZE);
 			data->lines_recorded++;
 			if (data->lines_recorded >= data->max_lines_recorded) {
 				fp_dbg("process_chunk: recorded %d lines, finishing",

libfprint/fpi-assembling.c

@@ -121,13 +121,12 @@ static void find_overlap(struct fpi_frame_asmbl_ctx *ctx,
 }
 
 static unsigned int do_movement_estimation(struct fpi_frame_asmbl_ctx *ctx,
-			    GSList *stripes, size_t num_stripes,
-			    gboolean reverse)
+			    GSList *stripes, gboolean reverse)
 {
-	GSList *list_entry = stripes;
+	GSList *l;
 	GTimer *timer;
-	int frame = 1;
-	struct fpi_frame *prev_stripe = list_entry->data;
+	guint num_frames = 0;
+	struct fpi_frame *prev_stripe;
 	unsigned int min_error;
 	/* Max error is width * height * 255, for AES2501 which has the largest
 	 * sensor its 192*16*255 = 783360. So for 32bit value it's ~5482 frame before
@@ -135,39 +134,34 @@ static unsigned int do_movement_estimation(struct fpi_frame_asmbl_ctx *ctx,
 	 */
 	unsigned long long total_error = 0;
 
-	list_entry = g_slist_next(list_entry);
-
 	timer = g_timer_new();
-	do {
-		struct fpi_frame *cur_stripe = list_entry->data;
+	prev_stripe = stripes->data;
+	for (l = stripes; l != NULL; l = l->next, num_frames++) {
+		struct fpi_frame *cur_stripe = l->data;
 
 		if (reverse) {
 			find_overlap(ctx, prev_stripe, cur_stripe, &min_error);
 			cur_stripe->delta_y = -cur_stripe->delta_y;
 			cur_stripe->delta_x = -cur_stripe->delta_x;
-		}
-		else
+		} else {
 			find_overlap(ctx, cur_stripe, prev_stripe, &min_error);
+		}
 		total_error += min_error;
 
-		frame++;
 		prev_stripe = cur_stripe;
-		list_entry = g_slist_next(list_entry);
-
-	} while (frame < num_stripes);
+	}
 
 	g_timer_stop(timer);
 	fp_dbg("calc delta completed in %f secs", g_timer_elapsed(timer, NULL));
 	g_timer_destroy(timer);
 
-	return total_error / num_stripes;
+	return total_error / num_frames;
 }
 
 /**
  * fpi_do_movement_estimation:
  * @ctx: #fpi_frame_asmbl_ctx - frame assembling context
  * @stripes: a singly-linked list of #fpi_frame
- * @num_stripes: number of items in @stripes to process
  *
  * fpi_do_movement_estimation() estimates the movement between adjacent
  * frames, populating @delta_x and @delta_y values for each #fpi_frame.
@@ -175,19 +169,17 @@ static unsigned int do_movement_estimation(struct fpi_frame_asmbl_ctx *ctx,
  * This function is used for devices that don't do movement estimation
  * in hardware. If hardware movement estimation is supported, the driver
  * should populate @delta_x and @delta_y instead.
- *
- * Note that @num_stripes might be shorter than the length of the list,
- * if some stripes should be skipped.
  */
 void fpi_do_movement_estimation(struct fpi_frame_asmbl_ctx *ctx,
-			    GSList *stripes, size_t num_stripes)
+				GSList                     *stripes)
 {
 	int err, rev_err;
-	err = do_movement_estimation(ctx, stripes, num_stripes, FALSE);
-	rev_err = do_movement_estimation(ctx, stripes, num_stripes, TRUE);
+
+	err = do_movement_estimation(ctx, stripes, FALSE);
+	rev_err = do_movement_estimation(ctx, stripes, TRUE);
 	fp_dbg("errors: %d rev: %d", err, rev_err);
 	if (err < rev_err) {
-		do_movement_estimation(ctx, stripes, num_stripes, FALSE);
+		do_movement_estimation(ctx, stripes, FALSE);
 	}
 }
 
@@ -256,45 +248,34 @@ static inline void aes_blit_stripe(struct fpi_frame_asmbl_ctx *ctx,
  * fpi_assemble_frames:
  * @ctx: #fpi_frame_asmbl_ctx - frame assembling context
  * @stripes: linked list of #fpi_frame
- * @num_stripes: number of items in @stripes to process
  *
  * fpi_assemble_frames() assembles individual frames into a single image.
  * It expects @delta_x and @delta_y of #fpi_frame to be populated.
  *
- * Note that @num_stripes might be shorter than the length of the list,
- * if some stripes should be skipped.
- *
  * Returns: a newly allocated #fp_img.
  */
 struct fp_img *fpi_assemble_frames(struct fpi_frame_asmbl_ctx *ctx,
-			    GSList *stripes, size_t num_stripes)
+				   GSList                     *stripes)
 {
-	GSList *stripe;
+	GSList *l;
 	struct fp_img *img;
 	int height = 0;
-	int i, y, x;
+	int y, x;
 	gboolean reverse = FALSE;
 	struct fpi_frame *fpi_frame;
 
 	//FIXME g_return_if_fail
-	BUG_ON(num_stripes == 0);
 	BUG_ON(ctx->image_width < ctx->frame_width);
 
-	/* Calculate height */
-	i = 0;
-	stripe = stripes;
-
 	/* No offset for 1st image */
-	fpi_frame = stripe->data;
+	fpi_frame = stripes->data;
 	fpi_frame->delta_x = 0;
 	fpi_frame->delta_y = 0;
-	do {
-		fpi_frame = stripe->data;
+	for (l = stripes; l != NULL; l = l->next) {
+		fpi_frame = l->data;
 
 		height += fpi_frame->delta_y;
-		i++;
-		stripe = g_slist_next(stripe);
-	} while (i < num_stripes);
+	}
 
 	fp_dbg("height is %d", height);
 
@@ -314,13 +295,11 @@ struct fp_img *fpi_assemble_frames(struct fpi_frame_asmbl_ctx *ctx,
 	img->height = height;
 
 	/* Assemble stripes */
-	i = 0;
-	stripe = stripes;
 	y = reverse ? (height - ctx->frame_height) : 0;
 	x = (ctx->image_width - ctx->frame_width) / 2;
 
-	do {
-		fpi_frame = stripe->data;
+	for (l = stripes; l != NULL; l = l->next) {
+		fpi_frame = l->data;
 
 		if(reverse) {
 			y += fpi_frame->delta_y;
@@ -333,10 +312,7 @@ struct fp_img *fpi_assemble_frames(struct fpi_frame_asmbl_ctx *ctx,
 			y += fpi_frame->delta_y;
 			x += fpi_frame->delta_x;
 		}
-
-		stripe = g_slist_next(stripe);
-		i++;
-	} while (i < num_stripes);
+	}
 
 	return img;
 }
@@ -365,7 +341,7 @@ static void median_filter(int *data, int size, int filtersize)
 			i1 = 0;
 		if (i2 >= size)
 			i2 = size-1;
-		memmove(sortbuf, data+i1, (i2-i1+1)*sizeof(int));
+		g_memmove(sortbuf, data+i1, (i2-i1+1)*sizeof(int));
 		g_qsort_with_data(sortbuf, i2-i1+1, sizeof(int), cmpint, NULL);
 		result[i] = sortbuf[(i2-i1+1)/2];
 	}
@@ -480,7 +456,7 @@ out:
 	img->height = line_ind;
 	img->width = ctx->line_width;
 	img->flags = FP_IMG_V_FLIPPED;
-	memmove(img->data, output, ctx->line_width * line_ind);
+	g_memmove(img->data, output, ctx->line_width * line_ind);
 	g_free(offsets);
 	g_free(output);
 	return img;

libfprint/fpi-assembling.h

@@ -63,10 +63,10 @@ struct fpi_frame_asmbl_ctx {
 };
 
 void fpi_do_movement_estimation(struct fpi_frame_asmbl_ctx *ctx,
-			    GSList *stripes, size_t num_stripes);
+				GSList                     *stripes);
 
 struct fp_img *fpi_assemble_frames(struct fpi_frame_asmbl_ctx *ctx,
-			    GSList *stripes, size_t num_stripes);
+				   GSList                     *stripes);
 
 /**
  * fpi_line_asmbl_ctx:

libfprint/fpi-async.c

@@ -387,21 +387,9 @@ API_EXPORTED int fp_async_verify_stop(struct fp_dev *dev,
 
 	g_return_val_if_fail(dev != NULL, -ENODEV);
 
-	G_DEBUG_HERE();
-
-	if (dev->state == DEV_STATE_VERIFY_STOPPING) {
-		fp_dbg ("Already stopping verification, returning -EINPROGRESS");
-		return -EINPROGRESS;
-	}
-
-	if (dev->state == DEV_STATE_INITIALIZED) {
-		if (callback)
-			callback(dev, user_data);
-		return 0;
-	}
-
 	drv = dev->drv;
 
+	G_DEBUG_HERE();
 	BUG_ON(dev->state != DEV_STATE_ERROR
 		&& dev->state != DEV_STATE_VERIFYING
 		&& dev->state != DEV_STATE_VERIFY_DONE);
@@ -523,21 +511,9 @@ API_EXPORTED int fp_async_identify_stop(struct fp_dev *dev,
 
 	g_return_val_if_fail(dev != NULL, -ENODEV);
 
-	G_DEBUG_HERE();
-
-	if (dev->state == DEV_STATE_IDENTIFY_STOPPING) {
-		fp_dbg ("Already stopping identification, returning -EINPROGRESS");
-		return -EINPROGRESS;
-	}
-
-	if (dev->state == DEV_STATE_INITIALIZED) {
-		if (callback)
-			callback(dev, user_data);
-		return 0;
-	}
-
 	drv = dev->drv;
 
+	G_DEBUG_HERE();
 	BUG_ON(dev->state != DEV_STATE_IDENTIFYING
 		&& dev->state != DEV_STATE_IDENTIFY_DONE);
 

libfprint/fpi-dev-img.c

@@ -485,15 +485,9 @@ void fpi_imgdev_activate_complete(struct fp_img_dev *imgdev, int status)
  */
 void fpi_imgdev_deactivate_complete(struct fp_img_dev *imgdev)
 {
-	enum fp_imgdev_action action;
-
 	G_DEBUG_HERE();
 
-	action = imgdev->action;
-	imgdev->action = IMG_ACTION_NONE;
-	imgdev->action_state = 0;
-
-	switch (action) {
+	switch (imgdev->action) {
 	case IMG_ACTION_ENROLL:
 		fpi_drvcb_enroll_stopped(FP_DEV(imgdev));
 		break;
@@ -510,6 +504,9 @@ void fpi_imgdev_deactivate_complete(struct fp_img_dev *imgdev)
 		fp_err("unhandled action %d", imgdev->action);
 		break;
 	}
+
+	imgdev->action = IMG_ACTION_NONE;
+	imgdev->action_state = 0;
 }
 
 int fpi_imgdev_get_img_width(struct fp_img_dev *imgdev)

meson.build

@@ -1,5 +1,5 @@
 project('libfprint', [ 'c', 'cpp' ],
-        version: '1.0',
+        version: '0.99.0',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',