Changeset 349 for trunk/src/pe2lx/icongrp.cpp

Timestamp:

Jul 20, 1999, 7:50:19 PM (26 years ago)

Author:

sandervl

Message:

Icon changes (saved in BITMAPINFOHEADER2 format)

File:

• trunk/src/pe2lx/icongrp.cpp (modified) (5 diffs)

trunk/src/pe2lx/icongrp.cpp

@@ -1 @@
-/* $Id: icongrp.cpp,v 1.3 1999-06-10 17:08:54 phaller Exp $ */
+/* $Id: icongrp.cpp,v 1.4 1999-07-20 17:50:19 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
  ResourceDirectory *rdir = (ResourceDirectory *)(ihdr + 1);
  int i, groupsize = 0;
- BITMAPARRAYFILEHEADER *bafh, *orgbafh;
+ BITMAPARRAYFILEHEADER2 *bafh, *orgbafh;
  OS2Icon *icon;
 
@@ -59 +59 @@
         rdir++;
   }
-  bafh    = (BITMAPARRAYFILEHEADER *)malloc(groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER));
+  bafh    = (BITMAPARRAYFILEHEADER2 *)malloc(groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER2));
   orgbafh = bafh;
 
@@ -65 +65 @@
   for(i=0;i<ihdr->wCount;i++) {
         bafh->usType    = BFT_BITMAPARRAY;
-        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER);
+        bafh->cbSize    = sizeof(BITMAPARRAYFILEHEADER2);
         bafh->cxDisplay = 0;
         bafh->cyDisplay = 0;
@@ -75 +75 @@
         }
         if(i != ihdr->wCount -1) {
-                bafh->offNext = (int)&bafh->bfh - (int)orgbafh + icon->QueryIconSize();
+                bafh->offNext = (int)&bafh->bfh2 - (int)orgbafh + icon->QueryIconSize();
         }
         else    bafh->offNext = 0;
 
-        icon->SetIconHdrOffset((int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER)-sizeof(BITMAPFILEHEADER));
+        icon->SetIconHdrOffset((int)bafh - (int)orgbafh + sizeof(BITMAPARRAYFILEHEADER2)-sizeof(BITMAPFILEHEADER2));
 
-        memcpy((char *)&bafh->bfh, (char *)icon->GetIconHeader(), icon->QueryIconSize());
-        bafh = (BITMAPARRAYFILEHEADER *)((int)&bafh->bfh + icon->QueryIconSize());
+        memcpy((char *)&bafh->bfh2, (char *)icon->GetIconHeader(), icon->QueryIconSize());
+        bafh = (BITMAPARRAYFILEHEADER2 *)((int)&bafh->bfh2 + icon->QueryIconSize());
         rdir++;
   }
-  OS2Exe.StoreResource(id, RT_POINTER, groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER), (char *)orgbafh);
+  OS2Exe.StoreResource(id, RT_POINTER, groupsize+ihdr->wCount*sizeof(BITMAPARRAYFILEHEADER2), (char *)orgbafh);
   free((char *)orgbafh);
 }