Commit 4badaeb3 authored by coppro's avatar coppro

Fixed symbol change crash. The symbol change menu still hovers around being...

Fixed symbol change crash. The symbol change menu still hovers around being completely out of date from the actual symbol, and the changes don't nessecarilly take place on the card either. Perhaps a caching problem?
parent a774cfb4
......@@ -15,10 +15,16 @@
// ----------------------------------------------------------------------------- : Symbol filtering
void filter_symbol(Image& symbol, const SymbolFilter& filter) {
if (!symbol.HasAlpha()) symbol.InitAlpha();
Byte* data = symbol.GetData();
Byte* alpha = symbol.GetAlpha();
UInt width = symbol.GetWidth(), height = symbol.GetHeight();
// HACK: wxGTK seems to fail sometimes if you ask it to allocate the alpha channel.
// This manually allocates the memory and gives it to the image to handle.
if (!alpha) {
alpha = (Byte*) malloc (sizeof(Byte) * width * height);
memset(alpha, 255, width * height);
symbol.SetAlpha(alpha);
}
for (UInt y = 0 ; y < width ; ++y) {
for (UInt x = 0 ; x < height ; ++x) {
// Determine set
......
......@@ -70,7 +70,7 @@ class Context {
Variable value; ///< Old value of that variable.
};
private:
/// Variables, indexed by integer naem (using string_to_variable)
/// Variables, indexed by integer name (using string_to_variable)
VectorIntMap<unsigned int, Variable> variables;
/// Shadowed variable bindings
vector<Binding> shadowed;
......
......@@ -292,7 +292,7 @@ void parseExpr(TokenIterator& input, Script& script, Precedence minPrec);
/// Parse an expression, possibly with operators applied. Optionally adds an instruction at the end.
/** @param input Read tokens from the input
* @param scrip Add resulting instructions to the script
* @param script Add resulting instructions to the script
* @param minPrec Minimum precedence level for operators
* @param closeWith Add this instruction at the end
* @param closeWithData Data for the instruction at the end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment