liblbx: Rename LBX_IMG to LBXimg.

[liblbx.git] / src / lbximg.c

diff --git a/src/lbximg.c b/src/lbximg.c
index 6bdbaae172a7b4838d0dd80343f3c98b0844c58f..d52f68840f5effee60652a2f3396f6287d288849 100644 (file)
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Simple command-line tool to convert an LBX image to a set of PNGs.
- *  Copyright (C) 2006-2008 Nick Bowler
+ *  Copyright (C) 2006-2010 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -234,7 +234,7 @@ err:
 
 static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
 {
-       LBX_IMG *overimg = lbximg_open(f, &lbx_default_fops, NULL);
+       LBXimg *overimg = lbximg_open(f, &lbx_default_fops, NULL);
        struct lbx_imginfo info;
 
        if (!overimg) {
@@ -259,7 +259,7 @@ static int loadoverride(FILE *f, struct lbx_colour palette[static 256])
        return 0;
 }
 
-static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
+static int loadpalette(LBXimg *img, struct lbx_imginfo *info,
                        FILE *palf, FILE *override,
                        struct lbx_colour palette[static 256])
 {
@@ -305,7 +305,7 @@ static int loadpalette(LBX_IMG *img, struct lbx_imginfo *info,
        return 0;
 }
 
-int decode(LBX_IMG *img, FILE *palf, FILE *override, char **argv)
+int decode(LBXimg *img, FILE *palf, FILE *override, char **argv)
 {
        unsigned char *framebits;
        struct lbx_colour palette[256];
@@ -373,7 +373,7 @@ int main(int argc, char **argv)
        struct lbx_pipe_state stdin_handle = { .f = stdin };
        FILE *palf = NULL, *overf = NULL;
        const char *file = NULL;
-       LBX_IMG *img;
+       LBXimg *img;
 
        static const char *sopts = "idnvf:p:O:V";
        static const struct option lopts[] = {