Changeset 17 for abuse/trunk/src/imlib/image.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/image.cpp (modified) (48 diffs)

abuse/trunk/src/imlib/image.cpp

@@ -12 +12 @@
 #include <stdlib.h>
 
-extern unsigned char current_background;
+extern uint8_t current_background;
 char *imerr_messages[]={"No error",
                         "Error occured while reading",
@@ -23 +23 @@
                         
                          
-short imerror=0;
-short swpfile_num=0;
-
-short current_error()
+int16_t imerror=0;
+int16_t swpfile_num=0;
+
+int16_t current_error()
 { return imerror; }
 
@@ -48 +48 @@
 }
 
-void set_error(short x)
+void set_error(int16_t x)
 { imerror=x; }
 
-short last_error()
-{
-  short ec;
+int16_t last_error()
+{
+  int16_t ec;
   ec=imerror;
   imerror=0;
@@ -62 +62 @@
 
 
-image_descriptor::image_descriptor(short length, short height,
+image_descriptor::image_descriptor(int16_t length, int16_t height,
                                    int keep_dirties, int static_memory)
 
@@ -72 +72 @@
 }
 
-void image::change_size(short new_width, short new_height, unsigned char *page)
+void image::change_size(int16_t new_width, int16_t new_height, uint8_t *page)
 {
   delete_page();
@@ -97 +97 @@
 }
 
-unsigned char image::pixel(short x, short y)
+uint8_t image::pixel(int16_t x, int16_t y)
 {
   CONDITION(x>=0 && x<width() && y>=0 && y<height(),
@@ -104 +104 @@
 }
 
-void image::putpixel(short x, short y, char color)
+void image::putpixel(int16_t x, int16_t y, char color)
 {
   CONDITION(x>=0 && x<width() && y>=0 && y<height(),
@@ -116 +116 @@
 
 
-image::image(short width, short height, unsigned char *page_buffer, short create_descriptor)
+image::image(int16_t width, int16_t height, uint8_t *page_buffer, int16_t create_descriptor)
 {
   w=width;
@@ -132 +132 @@
 image::image(spec_entry *e, bFILE *fp)
 {
-  short i; 
+  int16_t i; 
   fp->seek(e->offset,0);
-  w=fp->read_short();
-  h=fp->read_short();
+  w=fp->read_uint16();
+  h=fp->read_uint16();
   special=NULL;
   make_page(w,h,NULL);
@@ -145 +145 @@
 image::image(bFILE *fp)
 {
-  short i; 
-  w=fp->read_short();
-  h=fp->read_short();
+  int16_t i; 
+  w=fp->read_uint16();
+  h=fp->read_uint16();
   special=NULL;
   make_page(w,h,NULL);
@@ -172 +172 @@
 void image_init()
 {
-  unsigned char bt[2];
-  unsigned short wrd,*up;
+  uint8_t bt[2];
+  uint16_t wrd,*up;
   bt[0]=1;
   bt[1]=0;
-  up=(unsigned short *)bt;
-  wrd=int_to_intel(*up);
+  up=(uint16_t *)bt;
+  wrd=uint16_to_intel(*up);
   if (wrd!=0x01)
   { printf("Compiled under wrong ENDING-nes, edit system.h and try again\n");
@@ -187 +187 @@
 
 
-long image::total_pixels(unsigned char background)
-{
-  short i,j;
-  long co;
-  unsigned char *c;
+int32_t image::total_pixels(uint8_t background)
+{
+  int16_t i,j;
+  int32_t co;
+  uint8_t *c;
   for (co=0,i=height()-1;i>=0;i--)
   { c=scan_line(i);
@@ -200 +200 @@
 }
 
-void image::clear(short color)
-{
-  short i;
+void image::clear(int16_t color)
+{
+  int16_t i;
   if (color==-1) color=current_background;
   if (special)
@@ -220 +220 @@
 {
   image *im;
-  unsigned char *c,*dat;
+  uint8_t *c,*dat;
   int i;
-  dat=(unsigned char *)jmalloc(width(),"image copy");
+  dat=(uint8_t *)jmalloc(width(),"image copy");
   im=new image(width(),height());
   for (i=height()-1;i>=0;i--)
@@ -236 +236 @@
 
 
-void image::line(short x1, short y1,short x2, short y2, unsigned char color)
-{
-  short i,xc,yc,er,n,m,xi,yi,xcxi,ycyi,xcyi;
+void image::line(int16_t x1, int16_t y1,int16_t x2, int16_t y2, uint8_t color)
+{
+  int16_t i,xc,yc,er,n,m,xi,yi,xcxi,ycyi,xcyi;
   unsigned dcy,dcx;
   // check to make sure that both endpoint are on the screen
 
-  short cx1,cy1,cx2,cy2;
+  int16_t cx1,cy1,cx2,cy2;
 
   // check to see if the line is completly clipped off
@@ -378 +378 @@
 
 
-void image::put_image(image *screen, short x, short y, char transparent)
-{
-  short i,j,xl,yl;
-  unsigned char *pg1,*pg2,*source,*dest;
+void image::put_image(image *screen, int16_t x, int16_t y, char transparent)
+{
+  int16_t i,j,xl,yl;
+  uint8_t *pg1,*pg2,*source,*dest;
   if (screen->special)  // the screen is clipped then we onl want to put
                     // part of the image
@@ -417 +417 @@
 }
 
-void image::fill_image(image *screen, short x1, short y1, short x2, short y2, short allign)
-{
-  short i,j,w,xx,start,xl,starty;
-  unsigned char *pg1,*pg2;
+void image::fill_image(image *screen, int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t allign)
+{
+  int16_t i,j,w,xx,start,xl,starty;
+  uint8_t *pg1,*pg2;
   CHECK(x1<=x2 && y1<=y2);  // we should have gotten this
 
@@ -467 +467 @@
 
 
-void image::put_part(image *screen, short x, short y,
-                short x1, short y1, short x2, short y2, char transparent)
-{
-  short xl,yl,j,i;
-  short cx1,cy1,cx2,cy2;
-  unsigned char *pg1,*pg2,*source,*dest;
+void image::put_part(image *screen, int16_t x, int16_t y,
+                int16_t x1, int16_t y1, int16_t x2, int16_t y2, char transparent)
+{
+  int16_t xl,yl,j,i;
+  int16_t cx1,cy1,cx2,cy2;
+  uint8_t *pg1,*pg2,*source,*dest;
   CHECK(x1<=x2 && y1<=y2);
 
@@ -533 +533 @@
 }
 
-void image::put_part_xrev(image *screen, short x, short y,
-                short x1, short y1, short x2, short y2, char transparent)
-{
-  short xl,yl,j,i;
-  short cx1,cy1,cx2,cy2;
-  unsigned char *pg1,*pg2,*source,*dest;
+void image::put_part_xrev(image *screen, int16_t x, int16_t y,
+                int16_t x1, int16_t y1, int16_t x2, int16_t y2, char transparent)
+{
+  int16_t xl,yl,j,i;
+  int16_t cx1,cy1,cx2,cy2;
+  uint8_t *pg1,*pg2,*source,*dest;
   CHECK(x1<=x2 && y1<=y2);
 
@@ -596 +596 @@
 
 
-void image::put_part_masked(image *screen, image *mask, short x, short y,
-                short maskx, short masky,
-                short x1, short y1, short x2, short y2)
-{
-  short xl,yl,j,i,ml,mh;
-  short cx1,cy1,cx2,cy2;
-  unsigned char *pg1,*pg2,*pg3;
+void image::put_part_masked(image *screen, image *mask, int16_t x, int16_t y,
+                int16_t maskx, int16_t masky,
+                int16_t x1, int16_t y1, int16_t x2, int16_t y2)
+{
+  int16_t xl,yl,j,i,ml,mh;
+  int16_t cx1,cy1,cx2,cy2;
+  uint8_t *pg1,*pg2,*pg3;
   CHECK(x1<=x2 && y1<=y2);
 
@@ -658 +658 @@
 
 
-unsigned char image::brightest_color(palette *pal)
-{ unsigned char *p,r,g,b,bri;
-  short i,j;
-  long brv;
+uint8_t image::brightest_color(palette *pal)
+{ uint8_t *p,r,g,b,bri;
+  int16_t i,j;
+  int32_t brv;
   brv=0; bri=0;
   for (j=0;j<h;j++)
@@ -668 +668 @@
     for (i=0;i<w;i++)
     { pal->get(p[i],r,g,b);
-      if ((long)r*(long)g*(long)b>brv)
-      { brv=(long)r*(long)g*(long)b;
+      if ((int32_t)r*(int32_t)g*(int32_t)b>brv)
+      { brv=(int32_t)r*(int32_t)g*(int32_t)b;
         bri=p[i];
       }
@@ -677 +677 @@
 }
 
-unsigned char image::darkest_color(palette *pal, short noblack)
-{ unsigned char *p,r,g,b,bri;
-  short i,j;
-  long brv,x;
-  brv=(long)258*(long)258*(long)258; bri=0;
+uint8_t image::darkest_color(palette *pal, int16_t noblack)
+{ uint8_t *p,r,g,b,bri;
+  int16_t i,j;
+  int32_t brv,x;
+  brv=(int32_t)258*(int32_t)258*(int32_t)258; bri=0;
   for (j=0;j<h;j++)
   {
@@ -687 +687 @@
     for (i=0;i<w;i++)
     { pal->get(p[i],r,g,b);
-      x=(long)r*(long)g*(long)b;
+      x=(int32_t)r*(int32_t)g*(int32_t)b;
       if (x<brv && (x || !noblack))
       { brv=x;
@@ -697 +697 @@
 }
 
-void image::rectangle(short x1, short y1,short x2, short y2, unsigned char color)
+void image::rectangle(int16_t x1, int16_t y1,int16_t x2, int16_t y2, uint8_t color)
 {
   line(x1,y1,x2,y1,color);
@@ -705 +705 @@
 }
 
-void image::set_clip(short x1, short y1, short x2, short y2)
+void image::set_clip(int16_t x1, int16_t y1, int16_t x2, int16_t y2)
 {
   // If the image does not already have an Image descriptor, allocate one.
@@ -718 +718 @@
 }
 
-void image::get_clip (short &x1, short &y1, short &x2, short &y2)
+void image::get_clip (int16_t &x1, int16_t &y1, int16_t &x2, int16_t &y2)
 {
   if (special)
@@ -726 +726 @@
 }
 
-void image::in_clip  (short x1, short y1, short x2, short y2)
+void image::in_clip  (int16_t x1, int16_t y1, int16_t x2, int16_t y2)
 {
   if (special)
@@ -747 +747 @@
 {
   dirty_rect *p,*q;
-  short x1,y1,x2,y2,nn;
+  int16_t x1,y1,x2,y2,nn;
   x1=6000; y1=6000;
   x2=0; y2=0;
@@ -769 +769 @@
 void image_descriptor::delete_dirty(int x1, int y1, int x2, int y2)
 {
-  short i,ax1,ay1,ax2,ay2;
+  int16_t i,ax1,ay1,ax2,ay2;
   dirty_rect *p,*next;
   if (keep_dirt)
@@ -869 +869 @@
 void image_descriptor::add_dirty(int x1, int y1, int x2, int y2)
 {
-  short i;
+  int16_t i;
   dirty_rect *p;
   if (keep_dirt)
@@ -941 +941 @@
 }
 
-void image::bar      (short x1, short y1, short x2, short y2, unsigned char color)
-{
-  short y;
+void image::bar      (int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint8_t color)
+{
+  int16_t y;
   if (x1>x2 || y1>y2) return ;
   if (special)
@@ -964 +964 @@
 }
 
-void image::xor_bar  (short x1, short y1, short x2, short y2, unsigned char color)
-{
-  short y,x;
+void image::xor_bar  (int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint8_t color)
+{
+  int16_t y,x;
   if (x1>x2 || y1>y2) return ;
   if (special)
@@ -983 +983 @@
     return ;
 
-  unsigned char *sl=scan_line(y1)+x1; 
+  uint8_t *sl=scan_line(y1)+x1; 
   for (y=y1;y<=y2;y++)
   {
-    unsigned char *s=sl;
+    uint8_t *s=sl;
     for (x=x1;x<=x2;x++,s++)
       *s=(*s)^color;
@@ -996 +996 @@
 
 
-void image::unpack_scanline(short line, char bitsperpixel)
-{
-  short x;
-  unsigned char *sl,*ex,mask,bt,sh;
-  ex=(unsigned char *)jmalloc(width(),"image::unpacked scanline");
+void image::unpack_scanline(int16_t line, char bitsperpixel)
+{
+  int16_t x;
+  uint8_t *sl,*ex,mask,bt,sh;
+  ex=(uint8_t *)jmalloc(width(),"image::unpacked scanline");
   sl=scan_line(line);
   memcpy(ex,sl,width());
@@ -1018 +1018 @@
 void image::dither(palette *pal)
 {
-  short x,y,i,j;
-  unsigned char dt_matrix[]={0,  136,24, 170,
+  int16_t x,y,i,j;
+  uint8_t dt_matrix[]={0,  136,24, 170,
                    68, 204,102,238,
                    51, 187, 17,153,
                    119,255, 85,221};
 
-  unsigned char *sl;
+  uint8_t *sl;
   for (y=height()-1;y>=0;y--)
   {
@@ -1049 +1049 @@
 }
 
-void image::resize(short new_width, short new_height)
+void image::resize(int16_t new_width, int16_t new_height)
 {
   int old_width=width(),old_height=height();
-  unsigned char *im=(unsigned char *)jmalloc(width()*height(),"image::resized");
+  uint8_t *im=(uint8_t *)jmalloc(width()*height(),"image::resized");
   memcpy(im,scan_line(0),width()*height());
 
@@ -1060 +1060 @@
   h=new_height;
 
-  unsigned char *sl1,*sl2;
-  short y,y2,x2;
+  uint8_t *sl1,*sl2;
+  int16_t y,y2,x2;
   double yc,xc,yd,xd;
 
@@ -1080 +1080 @@
 }
 
-void image::scroll(short x1, short y1, short x2, short y2, short xd, short yd)
-{
-  short cx1,cy1,cx2,cy2;
+void image::scroll(int16_t x1, int16_t y1, int16_t x2, int16_t y2, int16_t xd, int16_t yd)
+{
+  int16_t cx1,cy1,cx2,cy2;
   CHECK(x1>=0 && y1>=0 && x1<x2 && y1<y2 && x2<width() && y2<height());
   if (special)
@@ -1089 +1089 @@
     x1=max(x1,cx1); y1=max(cy1,y1); x2=min(x2,cx2); y2=min(y2,cy2);
   }
-  short xsrc,ysrc,xdst,ydst,xtot=x2-x1-abs(xd)+1,ytot,xt;
-  unsigned char *src,*dst;
+  int16_t xsrc,ysrc,xdst,ydst,xtot=x2-x1-abs(xd)+1,ytot,xt;
+  uint8_t *src,*dst;
   if (xd<0) { xsrc=x1-xd; xdst=x1; } else { xsrc=x2-xd; xdst=x2; }
   if (yd<0) { ysrc=y1-yd; ydst=y1; } else { ysrc=y2-yd; ydst=y2; }
@@ -1107 +1107 @@
 
 
-image *image::create_smooth(short smoothness)
-{
-  short i,j,k,l,t,d;
+image *image::create_smooth(int16_t smoothness)
+{
+  int16_t i,j,k,l,t,d;
   image *im;
   CHECK(smoothness>=0);
@@ -1129 +1129 @@
 }
 
-void image::wiget_bar(short x1, short y1, short x2, short y2, 
-        unsigned char light, unsigned char med, unsigned char dark)
+void image::wiget_bar(int16_t x1, int16_t y1, int16_t x2, int16_t y2, 
+        uint8_t light, uint8_t med, uint8_t dark)
 {
   line(x1,y1,x2,y1,light);
@@ -1142 +1142 @@
 {
 public :
-  short x,y;
+  int16_t x,y;
   fill_rec *last;
-  fill_rec(short X, short Y, fill_rec *Last)
+  fill_rec(int16_t X, int16_t Y, fill_rec *Last)
   { x=X; y=Y; last=Last; }
 } ;
 
-void image::flood_fill(short x, short y, unsigned char color)
-{
-  unsigned char *sl,*above,*below;
+void image::flood_fill(int16_t x, int16_t y, uint8_t color)
+{
+  uint8_t *sl,*above,*below;
   fill_rec *recs=NULL,*r;
-  unsigned char fcolor;
+  uint8_t fcolor;
   sl=scan_line(y);
   fcolor=sl[x];
@@ -1231 +1231 @@
 #define LED_L 5
 #define LED_H 5
-void image::burn_led(short x, short y, long num, short color, short scale)
+void image::burn_led(int16_t x, int16_t y, int32_t num, int16_t color, int16_t scale)
 {
   char st[100];
-  short ledx[]={1,2,1,2,3,3,3,3,1,2,0,0,0,0};
-  short ledy[]={3,3,0,0,1,2,4,6,7,7,4,6,1,2};
-
-  short dig[]={2+4+8+16+32+64,4+8,2+4+1+32+16,2+4+1+8+16,64+1+4+8,
+  int16_t ledx[]={1,2,1,2,3,3,3,3,1,2,0,0,0,0};
+  int16_t ledy[]={3,3,0,0,1,2,4,6,7,7,4,6,1,2};
+
+  int16_t dig[]={2+4+8+16+32+64,4+8,2+4+1+32+16,2+4+1+8+16,64+1+4+8,
              2+64+1+8+16,64+32+1+8+16,2+4+8,1+2+4+8+16+32+64,64+2+4+1+8,1};
-  short xx,yy,zz;
-  sprintf(st,"%8ld",num);
+  int16_t xx,yy,zz;
+  sprintf(st,"%8ld",(long int)num);
   for (xx=0;xx<8;xx++)
   {
@@ -1258 +1258 @@
 }
 
-unsigned char dither_matrix[]={0,  136,24, 170,
+uint8_t dither_matrix[]={0,  136,24, 170,
                      68, 204,102,238,
                      51, 187, 17,153,
                      119,255, 85,221};
 
-image *image::copy_part_dithered (short x1, short y1, short x2, short y2)
-{
-  short x,y,cx1,cy1,cx2,cy2,ry,rx,bo,dity,ditx;
+image *image::copy_part_dithered (int16_t x1, int16_t y1, int16_t x2, int16_t y2)
+{
+  int16_t x,y,cx1,cy1,cx2,cy2,ry,rx,bo,dity,ditx;
   image *ret;
-  unsigned char *sl1,*sl2;
+  uint8_t *sl1,*sl2;
   get_clip(cx1,cy1,cx2,cy2);
   if (y1<cy1) y1=cy1;
@@ -1304 +1304 @@
 void image::flip_x()
 {
-  unsigned char *rev=(unsigned char *)jmalloc(width(),"image tmp::flipped_x"),*sl;
+  uint8_t *rev=(uint8_t *)jmalloc(width(),"image tmp::flipped_x"),*sl;
   CONDITION(rev,"memory allocation"); 
   int y,x,i;
@@ -1318 +1318 @@
 void image::flip_y()
 {
-  unsigned char *rev=(unsigned char *)jmalloc(width(),"image::flipped_y"),*sl;
+  uint8_t *rev=(uint8_t *)jmalloc(width(),"image::flipped_y"),*sl;
   CONDITION(rev,"memory allocation"); 
   int y;
@@ -1329 +1329 @@
 }
 
-void image::make_color(unsigned char color)
-{
-  unsigned char *sl;
+void image::make_color(uint8_t color)
+{
+  uint8_t *sl;
   int y,x;
   for (y=0;y<height();y++)