From fda7b94f490564568dee0ba6d6516943b0fd82a0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 16 Jan 2014 18:34:51 -0800
Subject: ACME-1236 : Small LLImageFilter clean up

---
 indra/llimage/llimagefilter.cpp | 33 ++++++++++-----------------------
 indra/llimage/llimagefilter.h   |  6 +++---
 2 files changed, 13 insertions(+), 26 deletions(-)

(limited to 'indra/llimage')

diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index 5c969001b7..cd03454cdd 100755
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -39,7 +39,7 @@
 // LLImageFilter
 //---------------------------------------------------------------------------
 
-LLImageFilter::LLImageFilter() :
+LLImageFilter::LLImageFilter(const std::string& file_path) :
     mFilterData(LLSD::emptyArray()),
     mImage(NULL),
     mHistoRed(NULL),
@@ -50,6 +50,15 @@ LLImageFilter::LLImageFilter() :
     mVignetteGamma(1.0),
     mVignetteMin(0.0)
 {
+    // Load filter description from file
+	llifstream filter_xml(file_path);
+	if (filter_xml.is_open())
+	{
+		// Load and parse the file
+		LLPointer<LLSDParser> parser = new LLSDXMLParser();
+		parser->parse(filter_xml, mFilterData, LLSDSerialize::SIZE_UNLIMITED);
+		filter_xml.close();
+	}
 }
 
 LLImageFilter::~LLImageFilter()
@@ -113,28 +122,6 @@ LLImageFilter::~LLImageFilter()
  "        - 'fade' : the filter is applied with full intensity in the center and fades to black to the periphery.\n"
  */
 
-//============================================================================
-// Load filter from file
-//============================================================================
-
-void LLImageFilter::loadFromFile(const std::string& file_path)
-{
-	//std::cout << "Loading filter settings from : " << file_path << std::endl;
-	llifstream filter_xml(file_path);
-	if (filter_xml.is_open())
-	{
-		// Load and parse the file
-		LLPointer<LLSDParser> parser = new LLSDXMLParser();
-		parser->parse(filter_xml, mFilterData, LLSDSerialize::SIZE_UNLIMITED);
-		filter_xml.close();
-	}
-	else
-	{
-        // File couldn't be open, reset the filter data
-		mFilterData = LLSD();
-	}
-}
-
 //============================================================================
 // Apply the filter data to the image passed as parameter
 //============================================================================
diff --git a/indra/llimage/llimagefilter.h b/indra/llimage/llimagefilter.h
index c67789ede0..dc092a47a5 100755
--- a/indra/llimage/llimagefilter.h
+++ b/indra/llimage/llimagefilter.h
@@ -54,15 +54,15 @@ typedef enum e_screen_mode
 } EScreenMode;
 
 //============================================================================
-// Image Filter 
+// LLImageFilter 
+//============================================================================
 
 class LLImageFilter
 {
 public:
-    LLImageFilter();
+    LLImageFilter(const std::string& file_path);
     ~LLImageFilter();
     
-    void loadFromFile(const std::string& file_path);
     void executeFilter(LLPointer<LLImageRaw> raw_image);
     
 private:
-- 
cgit v1.2.3