Changeset 115 for abuse/trunk/src/imlib/filter.cppTweet

Timestamp:

Mar 16, 2008, 10:51:54 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Add lock() and unlock() methods to jimage objects. They're no-ops, but the Win32/DirectX version uses them all over the place because it uses DirectDraw? surfaces. One day we may wish to merge Abuse Win32's video output, or to use the SDL blending functions. You never know.

File:

• abuse/trunk/src/imlib/filter.cpp (modified) (7 diffs)

abuse/trunk/src/imlib/filter.cpp

@@ -98 +98 @@
 int color_compare(void *c1, void *c2)
 {
-  long v1,v2;  
+  long v1,v2;
   unsigned char r1,g1,b1,r2,g2,b2;
   compare_pal->get(  *((unsigned char *)c1),r1,g1,b1);
@@ -106 +106 @@
   if (v1<v2) return -1;
   else if (v1>v2) return 1;
-  else return 0;     
+  else return 0;
 }
 
@@ -114 +114 @@
   unsigned char map[256],*last_start,*start;
   int i,last_color=0,color;
-  compare_pal=pal;  
+  compare_pal=pal;
   for (i=0;i,256;i++)
     map[i]=i;
 
-  qsort(map,1,1,color_compare); 
+  qsort(map,1,1,color_compare);
   colors=1<<color_bits;
   last_start=color_table=(unsigned char *)malloc(colors*colors*colors);
 
-  
- 
+
+
   last_color=map[0];
   last_dist=0;
-  
-  
+
+
   for (i=1;i<colors;i++)
-  {   
+  {
     color=map[i<<(8-color_bits)];
-    dist=       
+    dist=
 
     memset(c,
   }
-  
-  
+
+
 }*/
 
 
 color_filter::color_filter(palette *pal, int color_bits, void (*stat_fun)(int))
-{ 
+{
   color_bits=5;      // hard code 5 for now
   int r,g,b,rv,gv,bv,
@@ -147 +147 @@
       lshift=8-color_bits;
   unsigned char *pp;
-  
+
   long dist_sqr,best;
   int colors=1<<color_bits;
@@ -154 +154 @@
   {
     if (stat_fun) stat_fun(r);
-    rv=r<<lshift;    
+    rv=r<<lshift;
     for (g=0;g<colors;g++)
     {
-      gv=g<<lshift;      
+      gv=g<<lshift;
       for (b=0;b<colors;b++)
       {
-        bv=b<<lshift;      
+        bv=b<<lshift;
         best=0x7fffffff;
         for (i=0,pp=(unsigned char *)pal->addr();i<max;i++)
-        { 
+        {
           register long rd=*(pp++)-rv,
                         gd=*(pp++)-gv,
                         bd=*(pp++)-bv;
-          
+        
           dist_sqr=(long)rd*rd+(long)bd*bd+(long)gd*gd;
           if (dist_sqr<best)
@@ -177 +177 @@
       }
     }
-  }  
+  }
 }
 
@@ -203 +203 @@
 
 
-void filter::put_image(image *screen, image *im, short x, short y, char transparent)
-{
-  short cx1,cy1,cx2,cy2,x1=0,y1=0,x2=im->width()-1,y2=im->height()-1;
-  screen->get_clip(cx1,cy1,cx2,cy2);
-  
-  // see if the image gets clipped off the screen
-  if (x>cx2 || y>cy2 || x+(x2-x1)<cx1 || y+(y2-y1)<cy1) return ;
-  
-  if (x<cx1)
-  { x1+=(cx1-x); x=cx1; }
-  if (y<cy1)
-  { y1+=(cy1-y); y=cy1; }
-
-  if (x+x2-x1+1>cx2)
-  { x2=cx2-x+x1; }
-
-  if (y+y2-y1+1>cy2)
-  { y2=cy2-y+y1; }
-  if (x1>x2 || y1>y2) return ;    
-
-  
-
-
-  int xl=x2-x1+1;
-  int yl=y2-y1+1;
-
-  screen->add_dirty(x,y,x+xl-1,y+yl-1);
-
-  uint8_t *pg1=screen->scan_line(y),*source,*dest;
-  uint8_t *pg2=im->scan_line(y1);
-  int i;
-  for (int j=0;j<yl;j++)        
-  {
-    for (i=0,source=&pg2[x1],dest=&pg1[x];i<xl;i++,source++,dest++)     
-      if (!transparent || *source!=current_background) 
-        *dest=fdat[*source];
-    pg1=screen->next_line(y+j,pg1);  
-    pg2=im->next_line(y1+j,pg2);
-  }
-
-}
-
-
-
-
-
+void filter::put_image(image *screen, image *im, short x, short y,
+                       char transparent)
+{
+    short cx1, cy1, cx2, cy2, x1 = 0, y1 = 0,
+          x2 = im->width() - 1, y2 = im->height() - 1;
+    screen->get_clip(cx1,cy1,cx2,cy2);
+
+    // see if the image gets clipped off the screen
+    if(x > cx2 || y > cy2 || x + (x2 - x1) < cx1 || y + (y2 - y1) < cy1)
+        return;
+
+    if(x < cx1)
+    {
+        x1 += (cx1 - x);
+        x = cx1;
+    }
+    if(y < cy1)
+    {
+        y1 += (cy1 - y);
+         y = cy1;
+    }
+
+    if(x + x2 - x1 + 1 > cx2)
+        x2 = cx2 - x + x1;
+
+    if(y + y2 - y1 + 1 > cy2)
+        y2 = cy2 - y + y1;
+
+    if(x1 > x2 || y1 > y2)
+        return;
+
+    int xl = x2 - x1 + 1;
+    int yl = y2 - y1 + 1;
+
+    screen->add_dirty(x, y, x + xl - 1, y + yl - 1);
+
+    screen->lock();
+    im->lock();
+
+    uint8_t *pg1 = screen->scan_line(y), *source, *dest;
+    uint8_t *pg2 = im->scan_line(y1);
+    int i;
+    for(int j = 0; j < yl; j++)
+    {
+        for(i = 0, source = &pg2[x1], dest = &pg1[x];
+            i < xl;
+            i++, source++, dest++)      
+        {
+            if(!transparent || *source != current_background)
+                *dest=fdat[*source];
+        }
+        pg1 = screen->next_line(y + j, pg1);
+        pg2 = im->next_line(y1 + j, pg2);
+    }
+
+    im->unlock();
+    screen->unlock();
+}
+