Changeset 17 for abuse/trunk/src/imlib/pcxread.cppTweet

Timestamp:

Nov 10, 2005, 9:41:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• absolute shitloads of 64 bit fixes.

File:

• abuse/trunk/src/imlib/pcxread.cpp (modified) (2 diffs)

abuse/trunk/src/imlib/pcxread.cpp

@@ -18 +18 @@
   if (!fread(&PCX_header.encoding,1,1,fp)) return 0;  
   if (!fread(&PCX_header.bits_per_pixel,1,1,fp)) return 0;  
-  PCX_header.xmin=read_short(fp);
-  PCX_header.ymin=read_short(fp);  
-  PCX_header.xmax=read_short(fp);
-  PCX_header.ymax=read_short(fp);
-  PCX_header.hres=read_short(fp);
-  PCX_header.vres=read_short(fp);
+  PCX_header.xmin=read_uint16(fp);
+  PCX_header.ymin=read_uint16(fp);  
+  PCX_header.xmax=read_uint16(fp);
+  PCX_header.ymax=read_uint16(fp);
+  PCX_header.hres=read_uint16(fp);
+  PCX_header.vres=read_uint16(fp);
   if (!fread(PCX_header.palette,1,48,fp)) return 0;
   if (!fread(&PCX_header.reserved,1,1,fp)) return 0;
   if (!fread(&PCX_header.color_planes,1,1,fp)) return 0;
-  PCX_header.bytes_per_line=read_short(fp); 
-  PCX_header.palette_type=read_short(fp); 
+  PCX_header.bytes_per_line=read_uint16(fp); 
+  PCX_header.palette_type=read_uint16(fp); 
   if (!fread(PCX_header.filter,1,58,fp)) return 0;
   return 1;
@@ -39 +39 @@
   if (!fwrite(&PCX_header.encoding,1,1,fp)) return 0;  
   if (!fwrite(&PCX_header.bits_per_pixel,1,1,fp)) return 0;  
-  write_short(fp,PCX_header.xmin);
-  write_short(fp,PCX_header.ymin);  
-  write_short(fp,PCX_header.xmax);
-  write_short(fp,PCX_header.ymax);
-  write_short(fp,PCX_header.hres);
-  write_short(fp,PCX_header.vres);
+  write_uint16(fp,PCX_header.xmin);
+  write_uint16(fp,PCX_header.ymin);  
+  write_uint16(fp,PCX_header.xmax);
+  write_uint16(fp,PCX_header.ymax);
+  write_uint16(fp,PCX_header.hres);
+  write_uint16(fp,PCX_header.vres);
   if (!fwrite(PCX_header.palette,1,48,fp)) return 0;
   if (!fwrite(&PCX_header.reserved,1,1,fp)) return 0;
   if (!fwrite(&PCX_header.color_planes,1,1,fp)) return 0;
-  write_short(fp,PCX_header.bytes_per_line); 
-  write_short(fp,PCX_header.palette_type); 
+  write_uint16(fp,PCX_header.bytes_per_line); 
+  write_uint16(fp,PCX_header.palette_type); 
   if (!fwrite(PCX_header.filter,1,58,fp)) return 0;
   return 1;