Changeset 667Tweet

Timestamp:

May 16, 2011, 2:37:15 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: remove dead code.

Location:

abuse/trunk/src/imlib

Files:

• fonts.cpp (modified) (2 diffs)
• fonts.h (modified) (1 diff)
• image.cpp (modified) (1 diff)
• image.h (modified) (1 diff)

abuse/trunk/src/imlib/fonts.cpp

@@ -19 +19 @@
 #include "fonts.h"
 
-texture_font::texture_font(image *letters, image *font_pattern)
-{ fntpat=font_pattern;
-  let=letters;
-  tl=(let->Size().x+1)/32;
-  th=(let->Size().y+1)/8;
-}
-
-void texture_font::put_char(image *screen,  int x, int y, char ch)
-{ if (fntpat)
-    screen->PutPartMasked(fntpat, vec2i(x, y), let,
-       vec2i(((int)ch%32)*tl,((int)ch/32)*th), vec2i(0,0), vec2i(tl,th));
-  else screen->PutPart(let, vec2i(x, y), vec2i(((int)ch%32)*tl, ((int)ch/32)*th),
-     vec2i(((int)ch%32)*tl+tl, ((int)ch/32)*th+th), 1);
-}
-
-void texture_font::put_string(image *screen, int x, int y, char const *st)
-{ while (*st)
-  { put_char(screen,x,y,*st);
-    st++;
-    x+=tl;
-  }
-}
-
-
 void JCFont::put_string(image *screen, int x, int y, char const *st, int color)
 { while (*st)
@@ -50 +26 @@
   }
 }
-
 
 void JCFont::put_char(image *screen,  int x, int y, char ch, int color)

abuse/trunk/src/imlib/fonts.h

@@ -11 +11 @@
 #ifndef __FONTS_HPP_
 #define __FONTS_HPP_
+
 #include "image.h"
 #include "transimage.h"
-
-
-
-class texture_font
-{
-  int tl,th;
-  image *let,*fntpat;
-public:
-  texture_font(image *letters, image *font_pattern=NULL);
-  void put_char(image *screen,  int x, int y, char ch);
-  void put_string(image *screen, int x, int y, char const *st);
-  int height() { return th; }
-  int length() { return tl; }
-  int width() { return tl; }
-  image *font_image() { return let; }
-  image *font_patter() { return fntpat; }
-  ~texture_font() { if (let) delete let; if (fntpat) delete fntpat; }
-} ;
 
 class JCFont

abuse/trunk/src/imlib/image.cpp

@@ -371 +371 @@
 
     im->Unlock();
-    Unlock();
-}
-
-void image::PutPartMasked(image *im, vec2i pos, image *mask, vec2i mpos,
-                          vec2i aa, vec2i bb)
-{
-    CHECK(aa < bb);
-
-    if (m_special)
-    {
-        vec2i caa, cbb;
-        m_special->GetClip(caa, cbb);
-
-        if (!(pos < cbb && pos > aa - bb))
-            return;
-
-        aa += Max(caa - pos, vec2i(0));
-        pos += Max(caa - pos, vec2i(0));
-        bb = Min(bb, cbb - pos + aa);
-    }
-    else if (!(pos <= m_size && pos >= -aa))
-        return;
-
-    vec2i mask_size = mask->Size();
-
-    if (!(pos < m_size && aa < im->m_size && mpos < mask_size && aa < bb))
-        return;
-
-    bb = Min(bb, im->m_size);
-
-    vec2i span = bb - aa;
-    span = Min(span, m_size - pos);
-    AddDirty(pos.x, pos.y, pos.x + span.x, pos.y + span.y);
-
-    Lock();
-    mask->Lock();
-    im->Lock();
-
-    for (int j = 0; j < span.y; j++)
-    {
-        uint8_t *dst = scan_line(pos.y + j) + pos.x;
-        uint8_t *src = im->scan_line(aa.y + j) + aa.x;
-        uint8_t *pg3 = mask->scan_line(mpos.y) + mpos.x;
-
-        if (++mpos.y >= mask_size.y) // wrap mask y around
-            mpos.y = 0;
-
-        for (int i = 0; i < span.x; i++, dst++, src++, pg3++)
-        {
-            if (mpos.x + i >= mask_size.x) // wrap mask x around
-                pg3 -= mask_size.x;
-
-            if (pg3[mpos.x + i]) // check to make sure not 0 before putting
-                *dst = *src;
-        }
-    }
-
-    im->Unlock();
-    mask->Unlock();
     Unlock();
 }

abuse/trunk/src/imlib/image.h

@@ -125 +125 @@
     void PutPart(image *screen, vec2i pos, vec2i aa, vec2i bb,
                  int transparent = 0);
-    void PutPartMasked(image *screen, vec2i pos, image *mask, vec2i mpos,
-                       vec2i aa, vec2i bb);
     image *copy_part_dithered(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
     void Bar(vec2i p1, vec2i p2, uint8_t color);