diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-06-28 17:45:08 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-06-28 17:45:08 +0000 |
commit | cbbf595776cee6b8d8a24becf49ee6468eeba712 (patch) | |
tree | 194b774b9df9fa561c07bd1a880185211645d026 /converter/ppm/winico.h | |
parent | ac5acc75607aeb1cb79007b62afa8a7c49059f3c (diff) | |
download | netpbm-mirror-cbbf595776cee6b8d8a24becf49ee6468eeba712.tar.gz netpbm-mirror-cbbf595776cee6b8d8a24becf49ee6468eeba712.tar.xz netpbm-mirror-cbbf595776cee6b8d8a24becf49ee6468eeba712.zip |
Release 10.90.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3873 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/ppm/winico.h')
-rw-r--r-- | converter/ppm/winico.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/converter/ppm/winico.h b/converter/ppm/winico.h index 4b8ac38b..c6133ef0 100644 --- a/converter/ppm/winico.h +++ b/converter/ppm/winico.h @@ -28,21 +28,22 @@ struct MS_Ico_ { struct IC_Entry_ { - u1 width; - u1 height; /* - * color_count is actually a byte (u1)... but 0 = 256, so I've used a short (u2). + * width, height, color_count are a byte in the format, but 0 = 256, + * so it takes a short (u2) to represent the value normally. */ + u2 width; + u2 height; u2 color_count; u1 reserved; u2 planes; - u2 bitcount; + u2 bitcount; /* 0, 1, 4, or 8 */ u4 size_in_bytes; u4 file_offset; IC_InfoHeader ih; IC_Color * colors; /* - * Below here, I have useful fields which aren't in the spec, but + * Below here, I have useful fields which aren't in the spec, but * save having to keep stoopid amounts of global data. */ u1 * andBitmap; /* Used in reader. */ |