Clean up merge errors

src/paper.h

@@ -35,7 +35,6 @@ struct page_dims_s {
 	unsigned w_dpi;
 	bool pause;
 	/* set by printer ops */
-	bool auto_set;
 	unsigned line_size;
 	unsigned band_size;
 	unsigned num_lines;

src/prn_lbp2900.c

@@ -525,24 +525,6 @@ static void lbp3010_cancel_cleanup(struct printer_state_s *state)
 	capt_sendrecv(CAPT_GPIO, lbp3010_gpio_init, ARRAY_SIZE(lbp3010_gpio_init), NULL, 0);
 }
 
-static void lbp2900_cancel_cleanup(struct printer_state_s *state)
-{
-	(void) state;
-	const struct capt_status_s *status = lbp2900_get_status(state->ops);
-	uint8_t jbuf[2] = { LO(job), HI(job) };
-
-	capt_cleanup();
-	capt_sendrecv(CAPT_GPIO, lbp2900_gpio_init, ARRAY_SIZE(lbp2900_gpio_init), NULL, 0);
-	send_job_start(4, status->page_completed);
-	capt_sendrecv(CAPT_JOB_END, jbuf, 2, NULL, 0);
-}
-
-static void lbp3010_cancel_cleanup(struct printer_state_s *state)
-{
-	(void) state;
-	capt_sendrecv(CAPT_GPIO, lbp3010_gpio_init, ARRAY_SIZE(lbp3010_gpio_init), NULL, 0);
-}
-
 static void lbp2900_wait_user(struct printer_state_s *state)
 {
 	(void) state;
@@ -622,6 +604,7 @@ static struct lbp2900_ops_s lbp3000_ops = {
 };
 
 register_printer("LBP3000", lbp3000_ops.ops, EXPERIMENTAL);
+
 static struct lbp2900_ops_s lbp3010_ops = {
 	.ops = {
 		.job_prologue = lbp3010_job_prologue,

src/rastertocapt.c

@@ -268,6 +268,7 @@ static void do_print(int fd)
 
 			state->ipage += 1;
 
+			page_set_dims(&cached_page->dims, &header);
 
 			ops->page_setup(state, &cached_page->dims,
 					header.cupsWidth, header.cupsHeight);