Wed, 21 Jan 2015 20:38:21 +0100
fixed memory allocation bug
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2014 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "../../ucx/map.h" #include "image.h" #include "../common/properties.h" static UcxMap *image_map; void ui_image_init() { image_map = ucx_map_new(8); } void ui_add_image(char *imgname, char *filename) { // create file path char *path = uic_get_image_path(filename); if(!path) { // TODO: error fprintf(stderr, "UiError: pixmaps directory not set\n"); return; } GError *error = NULL; GdkPixbuf *image = gdk_pixbuf_new_from_file(path, &error); if(!image) { // TODO: error fprintf(stderr, "UiError: Cannot load image: %s\n", path); } else { ucx_map_cstr_put(image_map, imgname, image); } free(path); } GdkPixbuf* ui_get_image(char *name) { GdkPixbuf *pixbuf = ucx_map_cstr_get(image_map, name); if(pixbuf) { return pixbuf; } else { ui_add_image(name, name); return ucx_map_cstr_get(image_map, name); } }