* Step 2 of the code reorganisation: move each font to its corresponding

decoder's subdirectory.


git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/pwntcha/trunk@2318 92316355-f0b4-4df1-b90c-862c8a59935f

Makefile.am

@@ -1,7 +1,6 @@
-NULL = 
 
 SUBDIRS = src
-DIST_SUBDIRS = $(SUBDIRS) extras share
+DIST_SUBDIRS = $(SUBDIRS) extras
 
 EXTRA_DIST = \
 	bootstrap \

configure.ac

@@ -96,6 +96,5 @@ AC_OUTPUT([
   src/vbulletin/Makefile
   src/xanga/Makefile
   extras/Makefile
-  share/Makefile
 ])
 

share/Makefile.am

@@ -1,26 +0,0 @@
-
-NULL =
-EXTRA_DIST = \
-	font_authimage.png \
-	font_linuxfr.png \
-	font_phpbb.png \
-	font_slashdot.png \
-	font_vbulletin.png \
-	font_freesans_24_09AZ.bmp \
-	font_comic_24_az_messed.bmp \
-	font_comic_32_az.bmp \
-	font_freemonobold_24_az.bmp \
-	font_freemonobold_32_az.bmp \
-	font_freesans_24_09AZ.bmp \
-	font_freesansbold_32_az.bmp \
-	font_freesansbold_36_az_messed.bmp \
-	font_stencil_23_AZ.bmp \
-	font_stencil_24_AZ.bmp \
-	x_font_comic_24_az_messed.bmp \
-	x_font_comic_32_az.bmp \
-	x_font_freemonobold_24_az.bmp \
-	x_font_freemonobold_32_az.bmp \
-	x_font_freesansbold_32_az.bmp \
-	x_font_freesansbold_36_az_messed.bmp \
-	$(NULL)
-

src/authimage/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = authimage
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/authimage/decoder.c

@@ -29,7 +29,7 @@ char *decode_authimage(struct image *img)
 
     if(!font)
     {
-        font = font_load_fixed("font_authimage.png",
+        font = font_load_fixed(DECODER, "font.png",
                                "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
         if(!font)
             exit(-1);

src/clubic/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = clubic
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/clubic/decoder.c

@@ -52,7 +52,7 @@ static void find_glyphs(struct image *img)
 
     if(!font)
     {
-        font = font_load_variable("font_clubic.png", "0123456789");
+        font = font_load_variable(DECODER, "font.png", "0123456789");
         if(!font)
             exit(1);
     }

src/common.h

@@ -65,9 +65,9 @@ int getpixel(struct image *img, int x, int y, int *r, int *g, int *b);
 int setpixel(struct image *img, int x, int y, int r, int g, int b);
 
 /* font operations */
-struct font *font_load_fixed(char *file, char *chars);
-struct font *font_load_variable(char *file, char *chars);
-void font_free(struct font *font);
+struct font *font_load_fixed(char const *, char const *, char const *);
+struct font *font_load_variable(char const *, char const *, char const *);
+void font_free(struct font *);
 
 /* image filters */
 void filter_flood_fill(struct image *img, int x, int y, int r, int g, int b);

src/font.c

@@ -17,16 +17,22 @@
 #include "config.h"
 #include "common.h"
 
-struct font *font_load_fixed(char *file, char *chars)
+struct font *font_load_fixed(char const *decoder, char const *file,
+                             char const *chars)
 {
     char fontname[BUFSIZ];
     struct font *font;
     struct image *img;
     int i;
 
-    sprintf(fontname, "%s/%s", share, file);
+    sprintf(fontname, "src/%s/%s", decoder, file);
     img = image_load(fontname);
     if(!img)
+    {
+        sprintf(fontname, "%s/%s/%s", share, decoder, file);
+        img = image_load(fontname);
+    }
+    if(!img)
     {
         fprintf(stderr, "%s: cannot load font %s\n", argv0, fontname);
         return NULL;
@@ -50,7 +56,8 @@ struct font *font_load_fixed(char *file, char *chars)
     return font;
 }
 
-struct font *font_load_variable(char *file, char *chars)
+struct font *font_load_variable(char const *decoder, char const *file,
+                                char const *chars)
 {
     char fontname[BUFSIZ];
     struct font *font;
@@ -59,9 +66,14 @@ struct font *font_load_variable(char *file, char *chars)
     int x, y, i;
     int r, g, b;
 
-    sprintf(fontname, "%s/%s", share, file);
+    sprintf(fontname, "src/%s/%s", decoder, file);
     img = image_load(fontname);
     if(!img)
+    {
+        sprintf(fontname, "%s/%s/%s", share, decoder, file);
+        img = image_load(fontname);
+    }
+    if(!img)
     {
         fprintf(stderr, "%s: cannot load font %s\n", argv0, fontname);
         return NULL;

src/java/Makefile.am

@@ -1,6 +1,8 @@
 
+DECODER = java
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
 

src/linuxfr/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = linuxfr
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/linuxfr/decoder.c

@@ -29,7 +29,7 @@ char *decode_linuxfr(struct image *img)
 
     if(!font)
     {
-        font = font_load_fixed("font_linuxfr.png",
+        font = font_load_fixed(DECODER, "font.png",
                                "abcdefghijklmnopqrstuvwxyz"
                                "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                "0123456789");

src/livejournal/Makefile.am

@@ -1,6 +1,8 @@
 
+DECODER = livejournal
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
 

src/livejournal/decoder.c

@@ -58,7 +58,7 @@ static void find_glyphs(struct image *img)
 
     if(!font)
     {
-        font = font_load_variable("x_font_freesansbold_32_09az.bmp",
+        font = font_load_variable(DECODER, "x_freesansbold_32_09az.bmp",
                                   "0123456789abcdefghijklmnopqrstuvwxyz");
         if(!font)
             exit(1);

src/lmt/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = lmt
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = freesans_24_09AZ.bmp
 

src/lmt/decoder.c

@@ -55,7 +55,7 @@ static void find_glyphs(struct image *img)
 
     if(!font)
     {
-        font = font_load_variable("font_freesans_24_09AZ.bmp",
+        font = font_load_variable(DECODER, "freesans_24_09AZ.bmp",
                                   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
         filter_smooth(font->img);
         if(!font)

src/paypal/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = paypal
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = stencil_23_AZ.bmp stencil_24_AZ.bmp
 

src/paypal/decoder.c

@@ -47,8 +47,8 @@ static void find_glyphs(struct image *img)
     static struct font *fonts[FONTS];
     static char *files[] =
     {
-        "font_stencil_23_AZ.bmp", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-        "font_stencil_24_AZ.bmp", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+        "stencil_23_AZ.bmp", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+        "stencil_24_AZ.bmp", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
     };
     int x, y, i = 0, f;
     int r, g, b;
@@ -59,7 +59,8 @@ static void find_glyphs(struct image *img)
     {
         if(!fonts[f])
         {
-            fonts[f] = font_load_variable(files[f * 2], files[f * 2 + 1]);
+            fonts[f] = font_load_variable(DECODER,
+                                          files[f * 2], files[f * 2 + 1]);
             if(!fonts[f])
                 exit(1);
         }

src/phpbb/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = phpbb
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/phpbb/decoder.c

@@ -31,7 +31,7 @@ char *decode_phpbb(struct image *img)
 
     if(!font)
     {
-        font = font_load_fixed("font_phpbb.png",
+        font = font_load_fixed(DECODER, "font.png",
                                "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789");
         if(!font)
             exit(-1);

src/scode/Makefile.am

@@ -1,6 +1,8 @@
 
+DECODER = scode
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
 

src/slashdot/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = slashdot
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/slashdot/decoder.c

@@ -190,7 +190,8 @@ static void find_glyphs(struct image *img)
 
     if(!font)
     {
-        font = font_load_variable("font_slashdot.png", "abcdefgijkmnpqrstvwxyz");
+        font = font_load_variable(DECODER, "font.png",
+                                  "abcdefgijkmnpqrstvwxyz");
         if(!font)
             exit(1);
     }

src/ticketmaster/Makefile.am

@@ -1,6 +1,8 @@
 
+DECODER = ticketmaster
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
 

src/tickets/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = tickets
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font1.png font2.png font3.png font4.png font5.png font6.png font7.png font8.png
 

src/tickets/decoder.c

@@ -34,8 +34,8 @@ char *decode_tickets(struct image *img)
         if(!fonts[i])
         {
             char buf[BUFSIZ];
-            sprintf(buf, "font_tickets%i.png", i + 1);
-            fonts[i] = font_load_variable(buf, "0123456789");
+            sprintf(buf, "font%i.png", i + 1);
+            fonts[i] = font_load_variable(DECODER, buf, "0123456789");
             if(!fonts[i])
                 exit(-1);
         }

src/vbulletin/Makefile.am

@@ -1,6 +1,10 @@
 
+DECODER = vbulletin
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = font.png
 

src/vbulletin/decoder.c

@@ -29,7 +29,7 @@ char *decode_vbulletin(struct image *img)
 
     if(!font)
     {
-        font = font_load_fixed("font_vbulletin.png",
+        font = font_load_fixed(DECODER, "font.png",
                                "2346789ABCDEFGHJKLMNPRTWXYZ");
         if(!font)
             exit(-1);

src/xanga/Makefile.am

@@ -1,6 +1,22 @@
 
+DECODER = xanga
+
 noinst_LIBRARIES = libdecoder.a
 
 libdecoder_a_SOURCES = decoder.c
-libdecoder_a_CPPFLAGS = -I$(srcdir)/..
+libdecoder_a_CPPFLAGS = -I$(srcdir)/.. -DDECODER=\"$(DECODER)\"
+
+EXTRA_DIST = \
+    comic_24_az_messed.bmp \
+    comic_32_az.bmp \
+    freemonobold_24_az.bmp \
+    freemonobold_32_az.bmp \
+    freesansbold_32_az.bmp \
+    freesansbold_36_az_messed.bmp \
+    x_comic_24_az_messed.bmp \
+    x_comic_32_az.bmp \
+    x_freemonobold_24_az.bmp \
+    x_freemonobold_32_az.bmp \
+    x_freesansbold_32_az.bmp \
+    x_freesansbold_36_az_messed.bmp
 

src/xanga/decoder.c

@@ -120,13 +120,13 @@ static void find_glyphs(struct image *img)
     static struct font *fonts[FONTS];
     static char *files[] =
     {
-        "x_font_freemonobold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
-        "x_font_freemonobold_24_az.bmp", "abcdefghijklmnopqrstuvwxyz",
-        "x_font_freesansbold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
-        //"x_font_freeserifbold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
-        "x_font_comic_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
-        "x_font_comic_24_az_messed.bmp", "abcdefghijklmnopqrstuvwxyz",
-        "x_font_freesansbold_36_az_messed.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_freemonobold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_freemonobold_24_az.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_freesansbold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
+        //"x_freeserifbold_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_comic_32_az.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_comic_24_az_messed.bmp", "abcdefghijklmnopqrstuvwxyz",
+        "x_freesansbold_36_az_messed.bmp", "abcdefghijklmnopqrstuvwxyz",
     };
     struct image *tmp;
     int x, y, i = 0, f;
@@ -138,7 +138,8 @@ static void find_glyphs(struct image *img)
     {
         if(!fonts[f])
         {
-            fonts[f] = font_load_variable(files[f * 2], files[f * 2 + 1]);
+            fonts[f] = font_load_variable(DECODER,
+                                          files[f * 2], files[f * 2 + 1]);
             if(!fonts[f])
                 exit(1);
             //filter_smooth(fonts[f]->img);