From 14410da0014bf7b6b180516e81ff57475421e9b5 Mon Sep 17 00:00:00 2001
From: Arthur Moore <Arthur.Moore.git@cd-net.net>
Date: Wed, 18 Feb 2015 05:47:38 -0500
Subject: [PATCH] FilterMap is now correctly populated

---
 src/filters/filters.cpp | 44 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/filters/filters.cpp b/src/filters/filters.cpp
index d806268d..37cb5c25 100644
--- a/src/filters/filters.cpp
+++ b/src/filters/filters.cpp
@@ -10,36 +10,40 @@ namedfilter InsertFilter(std::string filterName, FilterFunc thirtyTwoBitFilter,
 //Actually make the fitlermap (since C++11 doesn't work right now)
 const std::map<std::string,filterpair> makeFilterMap()
 {
-    InsertFilter("Pixelate",Pixelate32,Pixelate);
-    InsertFilter("Scanlines",Scanlines32,Scanlines);
-    InsertFilter("ScanlinesTV",ScanlinesTV32,ScanlinesTV);
+    std::map<std::string,filterpair> tempMap;
+
+    tempMap.insert(InsertFilter("Pixelate",Pixelate32,Pixelate));
+    tempMap.insert(InsertFilter("Scanlines",Scanlines32,Scanlines));
+    tempMap.insert(InsertFilter("TV Mode",ScanlinesTV32,ScanlinesTV));
 
     //These require Init_2xSaI(u32 BitFormat);
-    InsertFilter("Simple2x",Simple2x32,Simple2x16);
-    InsertFilter("Simple3x",Simple3x32,Simple3x16);
-    InsertFilter("Simple4x",Simple4x32,Simple4x16);
+    tempMap.insert(InsertFilter("Simple 2x",Simple2x32,Simple2x16));
+    tempMap.insert(InsertFilter("Simple 3x",Simple3x32,Simple3x16));
+    tempMap.insert(InsertFilter("Simple 4x",Simple4x32,Simple4x16));
 
-    InsertFilter("Bilinear",Bilinear32,Bilinear);
-    InsertFilter("BilinearPlus",BilinearPlus32,BilinearPlus);
-    InsertFilter("AdMame2x",AdMame2x32,AdMame2x);
+    tempMap.insert(InsertFilter("Bilinear",Bilinear32,Bilinear));
+    tempMap.insert(InsertFilter("Bilinear Plus",BilinearPlus32,BilinearPlus));
+    tempMap.insert(InsertFilter("Advance MAME Scale2x",AdMame2x32,AdMame2x));
 
     //These require Init_2xSaI(u32 BitFormat);
-    InsertFilter("_2xSaI",_2xSaI32,_2xSaI);
-    InsertFilter("Super2xSaI",Super2xSaI32,Super2xSaI);
-    InsertFilter("SuperEagle",SuperEagle32,SuperEagle);
+    tempMap.insert(InsertFilter("2xSaI",_2xSaI32,_2xSaI));
+    tempMap.insert(InsertFilter("Super 2xSaI",Super2xSaI32,Super2xSaI));
+    tempMap.insert(InsertFilter("Super Eagle",SuperEagle32,SuperEagle));
 
     //These require calling hq2x_init first and whenever bpp changes
-    InsertFilter("hq2x",hq2x32,hq2x);
-    InsertFilter("lq2x",lq2x32,lq2x);
+    tempMap.insert(InsertFilter("hq2x",hq2x32,hq2x));
+    tempMap.insert(InsertFilter("lq2x",lq2x32,lq2x));
 
-    InsertFilter("hq3x",hq3x32,hq3x16);
-    InsertFilter("hq4x",hq4x32,hq4x16);
+    tempMap.insert(InsertFilter("HQ 3x",hq3x32,hq3x16));
+    tempMap.insert(InsertFilter("HQ 4x",hq4x32,hq4x16));
 
     //These require sdlStretchInit
-    InsertFilter("sdlStretch1x",sdlStretch1x,sdlStretch1x);
-    InsertFilter("sdlStretch2x",sdlStretch2x,sdlStretch2x);
-    InsertFilter("sdlStretch3x",sdlStretch3x,sdlStretch3x);
-    InsertFilter("sdlStretch4x",sdlStretch4x,sdlStretch4x);
+    tempMap.insert(InsertFilter("sdlStretch1x",sdlStretch1x,sdlStretch1x));
+    tempMap.insert(InsertFilter("sdlStretch2x",sdlStretch2x,sdlStretch2x));
+    tempMap.insert(InsertFilter("sdlStretch3x",sdlStretch3x,sdlStretch3x));
+    tempMap.insert(InsertFilter("sdlStretch4x",sdlStretch4x,sdlStretch4x));
+
+    return tempMap;
 }
 
 const std::map<std::string,filterpair> filters::filterMap = makeFilterMap();