From b7e2aa1bae2ec6f006fb077a4858e1a52218d85a Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 13 Oct 2010 20:30:09 +0000 Subject: [PATCH] added freeimage library (de)initialization git-svn-id: svn://anubis/fart/trunk@381 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- Makefile | 2 +- main/fart.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 434dbd0..87e50e5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ export CPPFLAGS += -I"$(shell pwd)" endif export CXXFLAGS := -Wall -O2 -LDFLAGS := -lfl -lpthread +LDFLAGS := -lfl -lpthread -lfreeimage SUBDIRS := util shapes main parser distrib diff --git a/main/fart.cc b/main/fart.cc index 4b1853b..841aacc 100644 --- a/main/fart.cc +++ b/main/fart.cc @@ -10,6 +10,8 @@ #include #include +#include + #include "Scene.h" #include "distrib/distrib.h" #include "BMP.h" @@ -186,6 +188,8 @@ int main(int argc, char * argv[]) srand(time(NULL)); + FreeImage_Initialise(FALSE); + const char * filename = argv[optind]; client_options.push_back(filename); Scene scene(scene_options, filename); @@ -334,6 +338,8 @@ int main(int argc, char * argv[]) cout << endl; } + FreeImage_DeInitialise(); + exit(0); return 0; }