display: cleanup resolveSpiceCopy

gnif · Nov 11, 2023 · 577f56a · 577f56a
1 parent e03b90e
commit 577f56a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/channel_display.c b/src/channel_display.c
@@ -172,13 +172,8 @@ static void resolveSpiceCopy(const uint8_t * data, uint8_t ** ptr,
 {
   resolveSpiceImage(data, ptr, &dst->src_bitmap);
 
-  const int copy =
-      sizeof(dst->src_area      ) +
-      sizeof(dst->rop_descriptor) +
-      sizeof(dst->scale_mode    );
-
-  memcpy(&dst->src_area, *ptr, copy);
-  *ptr += copy;
+  memcpy(&dst->meta, *ptr, sizeof(dst->meta));
+  *ptr += sizeof(dst->meta);
 
   resolveSpiceQMask(data, ptr, &dst->mask);
 }

diff --git a/src/draw.h b/src/draw.h
@@ -206,9 +206,13 @@ SpiceClip;
 typedef struct SpiceCopy
 {
   SpiceImage * src_bitmap;
-  SpiceRect    src_area;
-  uint16_t     rop_descriptor;
-  uint8_t      scale_mode;
+  struct
+  {
+    SpiceRect    src_area;
+    uint16_t     rop_descriptor;
+    uint8_t      scale_mode;
+  }
+  meta;
   SpiceQMask   mask;
 }
 SpiceCopy,