binutils/

[deliverable/binutils-gdb.git] / binutils / resrc.c

diff --git a/binutils/resrc.c b/binutils/resrc.c
index 2613b396d5ec8c028e68a341b6be641f5b474d01..c290a9d0c04d1ff082713750d7ab7f255af23717 100644 (file)
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -251,7 +251,7 @@ run_cmd (char *cmd, const char *redir)
   /* Restore stdout to its previous setting.  */
   dup2 (stdout_save, STDOUT_FILENO);
 
-  /* Close reponse file.  */
+  /* Close response file.  */
   close (redir_handle);
 
   if (pid == -1)
@@ -1040,10 +1040,20 @@ define_icon (struct res_id id, const struct res_res_info *resinfo,
       cg->height = icondirs[i].height;
       cg->colors = icondirs[i].colorcount;
 
-      cg->planes = 1;
-      cg->bits = 0;
-      while ((1 << cg->bits) < cg->colors)
-       ++cg->bits;
+      if (icondirs[i].u.icon.planes)
+       cg->planes = icondirs[i].u.icon.planes;
+      else
+       cg->planes = 1;
+
+      if (icondirs[i].u.icon.bits)
+       cg->bits = icondirs[i].u.icon.bits;
+      else
+       {
+         cg->bits = 0;
+
+         while ((1L << cg->bits) < cg->colors)
+           ++cg->bits;
+       }
 
       cg->bytes = icondirs[i].bytes;
       cg->index = first_icon + i + 1;