build: Remove use of per-target CFLAGS.

[liblbx.git] / src / gui / render.c

diff --git a/src/gui/render.c b/src/gui/render.c
index 584cfd2caf3e1ee2985cd86ef4fe173af717eec9..e30e6c845623feb011fb8397ce05bb80807a6434 100644 (file)
--- a/src/gui/render.c
+++ b/src/gui/render.c
@@ -16,6 +16,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include <config.h>
 #include <assert.h>
 #include <gtk/gtk.h>
 
@@ -46,15 +48,13 @@ static void get_colour(unsigned char index, unsigned char out[static 4])
        out[3] = -1; /* opaque */
 }
 
-int render_to_pixbuf(LBXimg *image, GdkPixbuf *pixbuf, unsigned frame)
+int render_to_pixbuf(struct lbx_image *image, GdkPixbuf *pixbuf, unsigned frame)
 {
        unsigned char **framedata, **framemask, *outbuf;
-       struct lbx_imginfo info;
        unsigned stride;
 
-       lbx_img_getinfo(image, &info);
-       assert(info.width  == gdk_pixbuf_get_width(pixbuf));
-       assert(info.height == gdk_pixbuf_get_height(pixbuf));
+       assert(image->width  == gdk_pixbuf_get_width(pixbuf));
+       assert(image->height == gdk_pixbuf_get_height(pixbuf));
 
        framedata = lbx_img_getframe(image, frame);
        g_return_val_if_fail(framedata, -1);
@@ -63,10 +63,10 @@ int render_to_pixbuf(LBXimg *image, GdkPixbuf *pixbuf, unsigned frame)
        outbuf = gdk_pixbuf_get_pixels(pixbuf);
        stride = gdk_pixbuf_get_rowstride(pixbuf);
 
-       for (unsigned i = 0; i < info.height; i++) {
+       for (unsigned i = 0; i < image->height; i++) {
                unsigned char (*px)[4] = (void *)(outbuf + i*stride);
 
-               for (unsigned j = 0; j < info.width; j++) {
+               for (unsigned j = 0; j < image->width; j++) {
                        if (framemask[i][j])
                                get_colour(framedata[i][j], px[j]);
                        else