ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temp fix so gdb works on out of tree wxvbam builds 

filterMap was causing wxvbam to crash when run with gdb in any folder but the top level

This needs a better fix, especially since filterMap is the cornerstone of my filters redesign/integration.
This commit is contained in:
Arthur Moore 2015-01-09 02:12:54 -05:00
parent fedaa24799
commit 5e6cd24322
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filters/filters.cpp
View File

@ -8,7 +8,7 @@ namedfilter InsertFilter(std::string filterName, FilterFunc thirtyTwoBitFilter,
} }
//Actually make the fitlermap (since C++11 doesn't work right now) //Actually make the fitlermap (since C++11 doesn't work right now)
std::map<std::string,filterpair> makeFilterMap() const std::map<std::string,filterpair> makeFilterMap()
{ {
InsertFilter("Pixelate",Pixelate32,Pixelate); InsertFilter("Pixelate",Pixelate32,Pixelate);
InsertFilter("Scanlines",Scanlines32,Scanlines); InsertFilter("Scanlines",Scanlines32,Scanlines);

6
src/filters/filters.hpp
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "interframe.hpp" #include "interframe.hpp"
#include "../System.h" #include "../common/Types.h"
//sdl //sdl
// Function pointer type for a filter function // Function pointer type for a filter function
@ -16,10 +16,10 @@ typedef std::pair<FilterFunc,FilterFunc> filterpair;
typedef std::pair<std::string,filterpair> namedfilter; typedef std::pair<std::string,filterpair> namedfilter;
//Function to make the filterMap //Function to make the filterMap
std::map<std::string,filterpair> makeFilterMap(); const std::map<std::string,filterpair> makeFilterMap();
//A named map of all the filters //A named map of all the filters
static const std::map<std::string,filterpair> filterMap = makeFilterMap(); // static const std::map<std::string,filterpair> filterMap = makeFilterMap();
//These are the available filters //These are the available filters

2
src/filters/interframe.hpp
View File

@ -3,7 +3,7 @@
#ifndef INTERFRAME_HPP #ifndef INTERFRAME_HPP
#define INTERFRAME_HPP #define INTERFRAME_HPP
#include "../System.h" #include "../common/Types.h"
extern int RGB_LOW_BITS_MASK; extern int RGB_LOW_BITS_MASK;