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

Timestamp:

Oct 23, 1999, 12:21:00 PM (26 years ago)

Author:

sandervl

Message:

Dani's icon conversion fix

File:

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

trunk/src/kernel32/cvticon.cpp

@@ -1 @@
-/* $Id: cvticon.cpp,v 1.4 1999-09-21 08:24:53 sandervl Exp $ */
+/* $Id: cvticon.cpp,v 1.5 1999-10-23 10:21:00 sandervl Exp $ */
 
 /*
@@ -85 +85 @@
  BITMAPFILEHEADER2 *iconhdr;
  BITMAPFILEHEADER2 *iconhdr2;
+ char *pAnd, *pXor;
 
   bwsize   = (bmpHdr->biWidth*(bmpHdr->biHeight/2))/8;
@@ -175 +176 @@
         }
   }
+
+#if 0
   //write 2*mono pixels + color pixels
   //There are icons without an AND mask, so check for it
-  if(bmpHdr->biSizeImage == colorsize) 
+  if(bmpHdr->biSizeImage == colorsize)
   {
         memset((char *)os2rgb, 0, bwsize);
@@ -192 +195 @@
 //        memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
   }
+#else
+  pXor = (char *)os2rgb;
+  pAnd = (char *)os2rgb + bwsize;
+
+  if ((size - (bmpHdr->biSize - rgbsize - colorsize)) == bwsize) {
+    char *q;
+    int i, linesize;
+
+    linesize = bmpHdr->biWidth / 8;
+    q = (char *)rgb + colorsize;
+    for (i = 0; i < (bmpHdr->biHeight/2); i++) {
+      memcpy (pAnd, q, linesize);
+      pAnd += linesize;
+      q += linesize;
+
+      memcpy (pXor, q, linesize);
+      pXor += linesize;
+      q += linesize;
+    }
+  } else {
+    memcpy (pAnd, (char *)rgb + colorsize, bwsize);
+    memset (pXor, 0, bwsize);
+  }
+  memcpy((char *)os2rgb+2*bwsize, (char *)rgb, colorsize);
+#endif
+
   *os2size = iconsize;
   return (void *)iconhdr;