Changeset 997 for trunk/src/kernel32/cvticon.cpp

Timestamp:

Sep 21, 1999, 10:24:53 AM (26 years ago)

Author:

sandervl

Message:

Fixes for icon(group) + cursorgroup conversion

File:

• trunk/src/kernel32/cvticon.cpp (modified) (4 diffs)

trunk/src/kernel32/cvticon.cpp

@@ -1 @@
-/* $Id: cvticon.cpp,v 1.3 1999-09-04 12:41:46 sandervl Exp $ */
+/* $Id: cvticon.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
 
 /*
@@ -131 +131 @@
   iconsize = 2*sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) +
              rgbsize + 2*bwsize + bmpHdr->biSizeImage;
-#if 0
-  //SvL: Not necessary anymore
-  //There are icons without an XOR mask, so check for it
-  if(bmpHdr->biSizeImage == colorsize) {
-        iconsize += bwsize;
-  }
-#endif
+
   iconhdr  = (BITMAPFILEHEADER2 *)malloc(iconsize);
   memset(iconhdr, 0, iconsize);
@@ -182 +176 @@
   }
   //write 2*mono pixels + color pixels
-  //There are icons without an XOR mask, so check for it
+  //There are icons without an AND mask, so check for it
   if(bmpHdr->biSizeImage == colorsize) 
   {
@@ -190 +184 @@
   }
   else {
-        memcpy((char *)os2rgb, (char *)rgb+colorsize, bwsize);
-        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize);
-        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
+        memset((char *)os2rgb, 0, bwsize); // windows has no xor mask
+        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize); // and-mask
+        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize); // color(xor-mask)
+
+//        memcpy((char *)os2rgb, (char *)rgb+colorsize, bwsize);
+//        memcpy((char *)os2rgb+bwsize, (char *)rgb+colorsize, bwsize);
+//        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
   }
   *os2size = iconsize;