about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-11-17 05:39:55 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-11-17 05:39:55 +0000
commit08b3834b300f676e7b03e16924fe2c3ff94b8fbc (patch)
treec7c00b9e1e072b3753c0ccf6d3ec71225c7c5d6b
parentb927b100ae3a818a927daf59f05a9fd463ffff20 (diff)
downloadnetpbm-mirror-08b3834b300f676e7b03e16924fe2c3ff94b8fbc.tar.gz
netpbm-mirror-08b3834b300f676e7b03e16924fe2c3ff94b8fbc.tar.xz
netpbm-mirror-08b3834b300f676e7b03e16924fe2c3ff94b8fbc.zip
Apparently, it works fine with bit depth 32
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4179 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/xwdtopnm.c8
-rw-r--r--doc/HISTORY2
2 files changed, 6 insertions, 4 deletions
diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c
index a99768b8..22399d47 100644
--- a/converter/other/xwdtopnm.c
+++ b/converter/other/xwdtopnm.c
@@ -549,10 +549,10 @@ processX11Header(X11WDFileHeader *  const h11P,
             pm_error("couldn't read rest of X11 XWD file header");
 
     /* Check whether we can handle this dump. */
-    if (h11FixedP->pixmap_depth > 24)
-        pm_error( "can't handle X11 pixmap_depth > 24");
-    if (h11FixedP->bits_per_rgb > 24)
-        pm_error("can't handle X11 bits_per_rgb > 24");
+    if (h11FixedP->pixmap_depth > 32)
+        pm_error( "can't handle X11 pixmap_depth > 32");
+    if (h11FixedP->bits_per_rgb > 32)
+        pm_error("can't handle X11 bits_per_rgb > 32");
     if (h11FixedP->pixmap_format != ZPixmap && h11FixedP->pixmap_depth != 1)
         pm_error("can't handle X11 pixmap_format %d with depth != 1",
                  h11FixedP->pixmap_format);
diff --git a/doc/HISTORY b/doc/HISTORY
index d9462f87..0dda909a 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,8 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.97.00
 
+              xwdtopnm: Add ability to process bit depth 32.
+
               pgmtoppm: Add -black, -white.
 
               pampaintspill: Add -near.  Thanks Scott Pakin.