avoid a possible sign-extension for offsets/sizes in SGI

and why is that using + instead of | ?

CID 185326.

diff --git a/SGI/SGI.pm b/SGI/SGI.pm
index 3a3bf90fc9eb3fc29356ed09e2df4a02a4046259..b033b2dd8e13efdf3152dfc2d52bd04cc28656b6 100644 (file)
--- a/SGI/SGI.pm
+++ b/SGI/SGI.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.03";
+  $VERSION = "0.04";

   
   require XSLoader;
   XSLoader::load('Imager::File::SGI', $VERSION);
   
   require XSLoader;
   XSLoader::load('Imager::File::SGI', $VERSION);

diff --git a/SGI/imsgi.c b/SGI/imsgi.c
index 3b61d8267e19e1f3434e8ef98a149b90b2c5f6fe..f6ad1b57daa855786d609beff17fb1ee75efcfa5 100644 (file)
--- a/SGI/imsgi.c
+++ b/SGI/imsgi.c
@@ -442,7 +442,7 @@ read_rle_tables(io_glue *ig, i_img *img,
   }
 
   for(i = 0; i < height * channels; i++) 
   }
 
   for(i = 0; i < height * channels; i++) 

-    start_tab[i] = (databuf[i*4] << 24) | (databuf[i*4+1] << 16) | 
+    start_tab[i] = ((unsigned long)databuf[i*4] << 24) | (databuf[i*4+1] << 16) |

       (databuf[i*4+2] << 8) | (databuf[i*4+3]);
 
 
       (databuf[i*4+2] << 8) | (databuf[i*4+3]);
 
 


@@ -453,8 +453,8 @@ read_rle_tables(io_glue *ig, i_img *img,
   }
 
   for(i=0; i < height * channels; i++) {
   }
 
   for(i=0; i < height * channels; i++) {

-    length_tab[i] = (databuf[i*4] << 24) + (databuf[i*4+1] << 16)+
-      (databuf[i*4+2] << 8) + (databuf[i*4+3]);
+    length_tab[i] = ((unsigned long)databuf[i*4] << 24) | (databuf[i*4+1] << 16) |
+      (databuf[i*4+2] << 8) | (databuf[i*4+3]);

     if (length_tab[i] > max_length)
       max_length = length_tab[i];
   }
     if (length_tab[i] > max_length)
       max_length = length_tab[i];
   }