WebSVN – eduke32 – Path Comparison – /polymer/eduke32/build Rev 4646 and /polymer/eduke32/build Rev 4647

Ignore whitespace Rev 4646 → Rev 4647

 /polymer/eduke32/build/src/kplib.c
 ,7 → 284,7
     nbitpos = LSWAPIL(*(int32_t *)&filptr[8]);
     nfilptr = (uint8_t *)&filptr[nbitpos+12];
     *(int32_t *)&fakebuf[0] = *(int32_t *)&filptr[0]; //Copy last dword of IDAT chunk
-    if (*(int32_t *)&filptr[12] == LSWAPIB(0x54414449)) //Copy 1st dword of next IDAT chunk
+    if (*(int32_t *)&filptr[12] == (int32_t)LSWAPIB(0x54414449)) //Copy 1st dword of next IDAT chunk
         *(int32_t *)&fakebuf[4] = *(int32_t *)&filptr[16];
     filptr = &fakebuf[4]; bitpos -= 32;
 }
 ,7 → 795,7
     if (!pnginited) { pnginited = 1; initpngtables(); }
-    if ((*(int32_t *)&kfilebuf[0] != LSWAPIB(0x474e5089)) || (*(int32_t *)&kfilebuf[4] != LSWAPIB(0x0a1a0a0d)))
+    if ((*(int32_t *)&kfilebuf[0] != (int32_t)LSWAPIB(0x474e5089)) || (*(int32_t *)&kfilebuf[4] != (int32_t)LSWAPIB(0x0a1a0a0d)))
         return(-1); //"Invalid PNG file signature"
     filptr = (uint8_t *)&kfilebuf[8];
 ,7 → 806,7
         leng = LSWAPIL(*(int32_t *)&filptr[0]); i = *(int32_t *)&filptr[4];
         filptr = &filptr[8];
-        if (i == LSWAPIB(0x52444849)) //IHDR (must be first)
+        if (i == (int32_t)LSWAPIB(0x52444849)) //IHDR (must be first)
         {
             xsiz = LSWAPIL(*(int32_t *)&filptr[0]); if (xsiz <= 0) return(-1);
             ysiz = LSWAPIL(*(int32_t *)&filptr[4]); if (ysiz <= 0) return(-1);
 ,12 → 825,12
                 for (i=0; i<paleng; i++,j+=k) palcol[i] = LSWAPIB(j);
             }
         }
-        else if (i == LSWAPIB(0x45544c50)) //PLTE (must be before IDAT)
+        else if (i == (int32_t)LSWAPIB(0x45544c50)) //PLTE (must be before IDAT)
         {
             paleng = leng/3;
             for (i=paleng-1; i>=0; i--) palcol[i] = LSWAPIB((LSWAPIL(*(int32_t *)&filptr[i*3])>>8)|0xff000000);
         }
-        else if (i == LSWAPIB(0x44474b62)) //bKGD (must be after PLTE and before IDAT)
+        else if (i == (int32_t)LSWAPIB(0x44474b62)) //bKGD (must be after PLTE and before IDAT)
         {
             switch (kcoltype)
             {
 ,7 → 854,7
             bakb = (bakcol&255);
             bakcol = LSWAPIB(bakcol);
         }
-        else if (i == LSWAPIB(0x534e5274)) //tRNS (must be after PLTE and before IDAT)
+        else if (i == (int32_t)LSWAPIB(0x534e5274)) //tRNS (must be after PLTE and before IDAT)
         {
             switch (kcoltype)
             {
 ,7 → 875,7
             default:;
             }
         }
-        else if (i == LSWAPIB(0x54414449)) { break; }  //IDAT
+        else if (i == (int32_t)LSWAPIB(0x54414449)) { break; }  //IDAT
         filptr = &filptr[leng+4]; //crc = LSWAPIL(*(int32_t *)&filptr[-4]);
     }
 ,23 → 1948,23
 //==============================  TARGA ends =================================
 //==============================  BMP begins =================================
 //TODO: handle BI_RLE8 and BI_RLE4 (compression types 1&2 respectively)
-//                        ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
-//                        ³  0(2): "BM"   ³
-// ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿³ 10(4): rastoff³ ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
-// ³headsiz=12 (OS/2 1.x)³³ 14(4): headsiz³ ³ All new formats: ³
-//ÚÁÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÁÁÄÄÄÄÄÄÄÄÄÄÄÄÄÂÄÁÄÁÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿
-//³ 18(2): xsiz                         ³ 18(4): xsiz                                  ³
-//³ 20(2): ysiz                         ³ 22(4): ysiz                                  ³
-//³ 22(2): planes (always 1)            ³ 26(2): planes (always 1)                     ³
-//³ 24(2): cdim (1,4,8,24)              ³ 28(2): cdim (1,4,8,16,24,32)                 ³
-//³ if (cdim < 16)                      ³ 30(4): compression (0,1,2,3!?,4)             ³
-//³    26(rastoff-14-headsiz): pal(bgr) ³ 34(4): (bitmap data size+3)&3                ³
-//³                                     ³ 46(4): N colors (0=2^cdim)                   ³
-//³                                     ³ if (cdim < 16)                               ³
-//³                                     ³    14+headsiz(rastoff-14-headsiz): pal(bgr0) ³
-//ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ
-//                      ³ rastoff(?): bitmap data ³
-//                      ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ
+//                        +---------------+
+//                        |  0(2): "BM"   |
+// +---------------------+| 10(4): rastoff| +------------------+
+// |headsiz=12 (OS/2 1.x)|| 14(4): headsiz| | All new formats: |
+//++---------------------++-------------+-+-+------------------+-----------------------+
+//| 18(2): xsiz                         | 18(4): xsiz                                  |
+//| 20(2): ysiz                         | 22(4): ysiz                                  |
+//| 22(2): planes (always 1)            | 26(2): planes (always 1)                     |
+//| 24(2): cdim (1,4,8,24)              | 28(2): cdim (1,4,8,16,24,32)                 |
+//| if (cdim < 16)                      | 30(4): compression (0,1,2,3!?,4)             |
+//|    26(rastoff-14-headsiz): pal(bgr) | 34(4): (bitmap data size+3)&3                |
+//|                                     | 46(4): N colors (0=2^cdim)                   |
+//|                                     | if (cdim < 16)                               |
+//|                                     |    14+headsiz(rastoff-14-headsiz): pal(bgr0) |
+//+---------------------+---------------+---------+------------------------------------+
+//                      | rastoff(?): bitmap data |
+//                      +-------------------------+
 static int32_t kbmprend(const char *buf, int32_t fleng,
                         intptr_t daframeplace, int32_t dabytesperline, int32_t daxres, int32_t dayres)
 {
 ,7 → 1974,7
     UNREFERENCED_PARAMETER(fleng);
     headsiz = *(int32_t *)&buf[14];
-    if (headsiz == LSWAPIB(12)) //OS/2 1.x (old format)
+    if (headsiz == (int32_t)LSWAPIB(12)) //OS/2 1.x (old format)
     {
         if (*(int16_t *)(&buf[22]) != SSWAPIB(1)) return(-1);
         xsiz = (int32_t)SSWAPIB(*(uint16_t *)&buf[18]);
 ,7 → 2000,7
     if (cdim < 16)
     {
         if (cdim == 2) { palcol[0] = 0xffffffff; palcol[1] = LSWAPIB(0xff000000); }
-        if (headsiz == LSWAPIB(12)) j = 3; else j = 4;
+        if (headsiz == (int32_t)LSWAPIB(12)) j = 3; else j = 4;
         for (i=0,cptr=&buf[headsiz+14]; cptr<&buf[rastoff]; i++,cptr+=j)
             palcol[i] = ((*(int32_t *)&cptr[0])|LSWAPIB(0xff000000));
         kcoltype = 3; bitdepth = (int8_t)cdim; paleng = i; //For PNGOUT
 ,7 → 2086,7
     intptr_t p,i;
     uint8_t c, *cptr;
-    if (*(int32_t *)buf != LSWAPIB(0x0801050a)) return(-1);
+    if (*(int32_t *)buf != (int32_t)LSWAPIB(0x0801050a)) return(-1);
     xsiz = SSWAPIB(*(int16_t *)&buf[ 8])-SSWAPIB(*(int16_t *)&buf[4])+1; if (xsiz <= 0) return(-1);
     ysiz = SSWAPIB(*(int16_t *)&buf[10])-SSWAPIB(*(int16_t *)&buf[6])+1; if (ysiz <= 0) return(-1);
     //buf[3]: bpp/plane:{1,2,4,8}
 ,11 → 2303,11
     if (*(uint16_t *)&ubuf[0] == SSWAPIB(0x5089)) //.PNG
     {
         lptr = (int32_t *)buf;
-        if ((lptr[0] != LSWAPIB(0x474e5089)) || (lptr[1] != LSWAPIB(0x0a1a0a0d))) return;
+        if ((lptr[0] != (int32_t)LSWAPIB(0x474e5089)) || (lptr[1] != (int32_t)LSWAPIB(0x0a1a0a0d))) return;
         lptr = &lptr[2];
         while (((uintptr_t)lptr-(uintptr_t)buf) < (uintptr_t)(leng-16))
         {
-            if (lptr[1] == LSWAPIB(0x52444849)) //IHDR
+            if (lptr[1] == (int32_t)LSWAPIB(0x52444849)) //IHDR
                 {(*xsiz) = LSWAPIL(lptr[2]); (*ysiz) = LSWAPIL(lptr[3]); break; }
             lptr = (int32_t *)((intptr_t)lptr + LSWAPIL(lptr[0]) + 12);
         }
 ,7 → 2336,7
         }
         else if ((ubuf[0] == 'B') && (ubuf[1] == 'M')) //.BMP
         {
-            if (*(int32_t *) (&buf[14]) == LSWAPIB(12)) //OS/2 1.x (old format)
+            if (*(int32_t *) (&buf[14]) == (int32_t)LSWAPIB(12)) //OS/2 1.x (old format)
             {
                 if (*(int16_t *) (&buf[22]) != SSWAPIB(1)) return;
                 (*xsiz) = (int32_t) SSWAPIB(*(uint16_t *) &buf[18]);
 ,7 → 2349,7
                 (*ysiz) = LSWAPIB(*(int32_t *) &buf[22]);
             }
         }
-        else if (*(int32_t *) ubuf == LSWAPIB(0x0801050a)) //.PCX
+        else if (*(int32_t *) ubuf == (int32_t)LSWAPIB(0x0801050a)) //.PCX
         {
             (*xsiz) = SSWAPIB(*(int16_t *) &buf[8])-SSWAPIB(*(int16_t *) &buf[4])+1;
             (*ysiz) = SSWAPIB(*(int16_t *) &buf[10])-SSWAPIB(*(int16_t *) &buf[6])+1;
 ,7 → 2394,7
             return(kgifrend(buf, leng, frameptr, bpl, xdim, ydim));
         else if ((ubuf[0] == 'B') && (ubuf[1] == 'M')) //.BMP
             return(kbmprend(buf, leng, frameptr, bpl, xdim, ydim));
-        else if (*(int32_t *) ubuf == LSWAPIB(0x0801050a)) //.PCX
+        else if (*(int32_t *) ubuf == (int32_t)LSWAPIB(0x0801050a)) //.PCX
             return(kpcxrend(buf, leng, frameptr, bpl, xdim, ydim));
 #ifdef KPCEL
         else if ((ubuf[0] == 0x19) && (ubuf[1] == 0x91) && (ubuf[10] == 8) && (ubuf[11] == 0)) //old .CEL/.PIC
 ,11 → 2538,11
     zipnamoffs = kzhashpos; kzhashpos += i;
     fread(&i,4,1,fil);
-    if (i == LSWAPIB(0x04034b50)) //'PK\3\4' is ZIP file id
+    if (i == (int32_t)LSWAPIB(0x04034b50)) //'PK\3\4' is ZIP file id
     {
         fseek(fil,-22,SEEK_END);
         fread(tempbuf,22,1,fil);
-        if (*(int32_t *)&tempbuf[0] == LSWAPIB(0x06054b50)) //Fast way of finding dir info
+        if (*(int32_t *)&tempbuf[0] == (int32_t)LSWAPIB(0x06054b50)) //Fast way of finding dir info
         {
             numfiles = SSWAPIB(*(int16_t *)&tempbuf[10]);
             fseek(fil,LSWAPIB(*(int32_t *)&tempbuf[16]),SEEK_SET);
 ,8 → 2553,8
             while (1)
             {
                 if (!fread(&j,4,1,fil)) { numfiles = -1; break; }
-                if (j == LSWAPIB(0x02014b50)) break; //Found central file header :)
-                if (j != LSWAPIB(0x04034b50)) { numfiles = -1; break; }
+                if (j == (int32_t)LSWAPIB(0x02014b50)) break; //Found central file header :)
+                if (j != (int32_t)LSWAPIB(0x04034b50)) { numfiles = -1; break; }
                 fread(tempbuf,26,1,fil);
                 fseek(fil,LSWAPIB(*(int32_t *)&tempbuf[14]) + SSWAPIB(*(int16_t *)&tempbuf[24]) + SSWAPIB(*(int16_t *)&tempbuf[22]),SEEK_CUR);
                 numfiles++;
 ,7 → 2565,7
         for (i=0; i<numfiles; i++)
         {
             fread(tempbuf,46,1,fil);
-            if (*(int32_t *)&tempbuf[0] != LSWAPIB(0x02014b50)) { fclose(fil); return(0); }
+            if (*(int32_t *)&tempbuf[0] != (int32_t)LSWAPIB(0x02014b50)) { fclose(fil); return(0); }
             j = SSWAPIB(*(int16_t *)&tempbuf[28]); //filename length
             fread(&tempbuf[46],j,1,fil);
 ,11 → 2588,11
             fseek(fil,j,SEEK_CUR);
         }
     }
-    else if (i == LSWAPIB(0x536e654b)) //'KenS' is GRP file id
+    else if (i == (int32_t)LSWAPIB(0x536e654b)) //'KenS' is GRP file id
     {
         fread(tempbuf,12,1,fil);
-        if ((*(int32_t *)&tempbuf[0] != LSWAPIB(0x65766c69)) || //'ilve'
-                (*(int32_t *)&tempbuf[4] != LSWAPIB(0x6e616d72)))   //'rman'
+        if ((*(int32_t *)&tempbuf[0] != (int32_t)LSWAPIB(0x65766c69)) || //'ilve'
+                (*(int32_t *)&tempbuf[4] != (int32_t)LSWAPIB(0x6e616d72)))   //'rman'
             { fclose(fil); return(0); }
         numfiles = LSWAPIB(*(int32_t *)&tempbuf[8]); k = ((numfiles+1)<<4);
         for (i=0; i<numfiles; i++,k+=leng)
 ,7 → 2666,7
         else
         {
             fread(tempbuf,30,1,fil);
-            if (*(int32_t *)&tempbuf[0] != LSWAPIB(0x04034b50)) { fclose(fil); return(0); }
+            if (*(int32_t *)&tempbuf[0] != (int32_t)LSWAPIB(0x04034b50)) { fclose(fil); return(0); }
             fseek(fil,SSWAPIB(*(int16_t *)&tempbuf[26])+SSWAPIB(*(int16_t *)&tempbuf[28]),SEEK_CUR);
             kzfs.fil = fil;
 ,7 → 2680,7
             case 8:
                     if (!pnginited) { pnginited = 1; initpngtables(); }
                 kzfs.comptell = 0;
-                kzfs.compleng = LSWAPIB(*(int32_t *)&tempbuf[18]);
+                kzfs.compleng = (int32_t)LSWAPIB(*(int32_t *)&tempbuf[18]);
                 //WARNING: No file in ZIP can be > 2GB-32K bytes
                 gslidew = 0x7fffffff; //Force reload at beginning

 /polymer/eduke32/build/src/pragmas.c
 ,7 → 15,10
 #if defined(__GNUC__) && defined(GEKKO)
 // naked function (no prolog/epilog)
-// FIXME: this function produces unused parameter warnings and a missing return warning
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wreturn-type"
+int32_t scale(int32_t a, int32_t d, int32_t c) ATTRIBUTE((naked));
 int32_t scale(int32_t a, int32_t d, int32_t c)
 {
 //      return ((int64_t)a * d) / c;
 ,6 → 98,7
                 " blr\n"
         );
 }
+#pragma GCC diagnostic pop
 void clearbufbyte(void *d, int32_t c, int32_t a)
 {

 /polymer/eduke32/build/src/startosx.editor.m
 ,12 → 32,12
 - (IBAction)alwaysShowClicked:(id)sender
 {
-        UNREFERENCED_PARAMETER(sender);
+    UNREFERENCED_PARAMETER(sender);
 }
 - (IBAction)fullscreenClicked:(id)sender
 {
-        UNREFERENCED_PARAMETER(sender);
+    UNREFERENCED_PARAMETER(sender);
     // XXX: recalculate the video modes list to take into account the fullscreen status
 }
 ,7 → 44,7
 - (IBAction)cancel:(id)sender
 {
-        UNREFERENCED_PARAMETER(sender);
+    UNREFERENCED_PARAMETER(sender);
     [nsapp abortModal];
 }
 ,7 → 51,7
 - (IBAction)start:(id)sender
 {
-        UNREFERENCED_PARAMETER(sender);
+    UNREFERENCED_PARAMETER(sender);
     // XXX: write the states of the form controls to their respective homes
     [nsapp stopModal];
 ,7 → 176,7
 int startwin_idle(void *v)
 {
-        UNREFERENCED_PARAMETER(v);
+    UNREFERENCED_PARAMETER(v);
     if (startwin) [[startwin window] displayIfNeeded];
     return 0;

Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 4646 → Rev 4647