X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkutil%2Fimage.cpp;h=16c03c54fc41f460e736bda8e971e00bb8fabcf5;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=210b055c076a74f45cabcda6e38f984ed497aecf;hpb=0a6d5683b0cfa1a0bd7ef64bada105dbe4ddd6e1;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/image.cpp b/libs/gtkutil/image.cpp
index 210b055c..16c03c54 100644
--- a/libs/gtkutil/image.cpp
+++ b/libs/gtkutil/image.cpp
@@ -28,54 +28,55 @@
 #include "stream/textstream.h"
 
 
-namespace
-{
-CopiedString g_bitmapsPath;
+namespace {
+    CopiedString g_bitmapsPath;
 }
 
-void BitmapsPath_set( const char* path ){
-	g_bitmapsPath = path;
+void BitmapsPath_set(const char *path)
+{
+    g_bitmapsPath = path;
 }
 
-GdkPixbuf* pixbuf_new_from_file_with_mask( const char* filename ){
-	GdkPixbuf* rgb = gdk_pixbuf_new_from_file( filename, 0 );
-	if ( rgb == 0 ) {
-		return 0;
-	}
-	else
-	{
-		GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, FALSE, 255, 0, 255 );
-		g_object_unref( rgb );
-		return rgba;
-	}
+GdkPixbuf *pixbuf_new_from_file_with_mask(const char *filename)
+{
+    GdkPixbuf *rgb = gdk_pixbuf_new_from_file(filename, 0);
+    if (rgb == 0) {
+        return 0;
+    } else {
+        GdkPixbuf *rgba = gdk_pixbuf_add_alpha(rgb, FALSE, 255, 0, 255);
+        g_object_unref(rgb);
+        return rgba;
+    }
 }
 
-ui::Image image_new_from_file_with_mask( const char* filename ){
-	GdkPixbuf* rgba = pixbuf_new_from_file_with_mask( filename );
-	if ( rgba == 0 ) {
-		return ui::Image(ui::null);
-	}
-	else
-	{
-		auto image = ui::Image::from( gtk_image_new_from_pixbuf( rgba ) );
-		g_object_unref( rgba );
-		return image;
-	}
+ui::Image image_new_from_file_with_mask(const char *filename)
+{
+    GdkPixbuf *rgba = pixbuf_new_from_file_with_mask(filename);
+    if (rgba == 0) {
+        return ui::Image(ui::null);
+    } else {
+        auto image = ui::Image::from(gtk_image_new_from_pixbuf(rgba));
+        g_object_unref(rgba);
+        return image;
+    }
 }
 
-ui::Image image_new_missing(){
-	return ui::Image::from( gtk_image_new_from_stock( GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_SMALL_TOOLBAR ) );
+ui::Image image_new_missing()
+{
+    return ui::Image::from(gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_SMALL_TOOLBAR));
 }
 
-ui::Image new_image( const char* filename ){
-	if ( auto image = image_new_from_file_with_mask( filename ) ) {
-		return image;
-	}
-	return image_new_missing();
+ui::Image new_image(const char *filename)
+{
+    if (auto image = image_new_from_file_with_mask(filename)) {
+        return image;
+    }
+    return image_new_missing();
 }
 
-ui::Image new_local_image( const char* filename ){
-	StringOutputStream fullPath( 256 );
-	fullPath << g_bitmapsPath.c_str() << filename;
-	return new_image( fullPath.c_str() );
+ui::Image new_local_image(const char *filename)
+{
+    StringOutputStream fullPath(256);
+    fullPath << g_bitmapsPath.c_str() << filename;
+    return new_image(fullPath.c_str());
 }