Merge commit 'upstream/2.31.90.1'

1 files changed, 6 insertions, 8 deletions

diff --git a/src/scanner.h b/src/scanner.h
index 5acdc84..72a4ffd 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -33,6 +33,9 @@ typedef struct
     /* Bit depth */
     gint depth;
 
+    /* Number of colour channels */
+    gint n_channels;
+
     /* Resolution */
     gdouble dpi;
 
@@ -50,14 +53,9 @@ typedef struct
 
     /* Width in pixels and format */
     gint width, depth;
-    enum
-    {
-        LINE_GRAY,
-        LINE_RGB,
-        LINE_RED,
-        LINE_GREEN,
-        LINE_BLUE
-    } format;
+
+    /* Channel for this line or -1 for all channels */
+    gint channel;
     
     /* Raw line data */
     guchar *data;