projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
tool
/
main.cpp
diff --git
a/synfig-core/trunk/src/tool/main.cpp
b/synfig-core/trunk/src/tool/main.cpp
index
7e5b189
..
22f5a98
100644
(file)
--- a/
synfig-core/trunk/src/tool/main.cpp
+++ b/
synfig-core/trunk/src/tool/main.cpp
@@
-667,6
+667,8
@@
int extract_RendDesc(arg_list_t &arg_list,RendDesc &desc)
//desc.set_gamma(Gamma(atof(iter->c_str())));
arg_list.erase(iter);
}
//desc.set_gamma(Gamma(atof(iter->c_str())));
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
if(w&&h)
{
}
if(w&&h)
{
@@
-704,6
+706,8
@@
int extract_quality(arg_list_t &arg_list,int &quality)
VERBOSE_OUT(1)<<strprintf(_("Quality set to %d"),quality)<<endl;
arg_list.erase(iter);
}
VERBOSE_OUT(1)<<strprintf(_("Quality set to %d"),quality)<<endl;
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return SYNFIGTOOL_OK;
}
return SYNFIGTOOL_OK;
@@
-722,6
+726,8
@@
int extract_threads(arg_list_t &arg_list,int &threads)
VERBOSE_OUT(1)<<strprintf(_("Threads set to %d"),threads)<<endl;
arg_list.erase(iter);
}
VERBOSE_OUT(1)<<strprintf(_("Threads set to %d"),threads)<<endl;
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return SYNFIGTOOL_OK;
}
return SYNFIGTOOL_OK;
@@
-741,6
+747,8
@@
int extract_target(arg_list_t &arg_list,string &type)
type=*iter;
arg_list.erase(iter);
}
type=*iter;
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return SYNFIGTOOL_OK;
}
return SYNFIGTOOL_OK;
@@
-760,6
+768,8
@@
int extract_append(arg_list_t &arg_list,string &filename)
filename=*iter;
arg_list.erase(iter);
}
filename=*iter;
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return SYNFIGTOOL_OK;
}
return SYNFIGTOOL_OK;
@@
-781,6
+791,8
@@
int extract_outfile(arg_list_t &arg_list,string &outfile)
arg_list.erase(iter);
ret=SYNFIGTOOL_OK;
}
arg_list.erase(iter);
ret=SYNFIGTOOL_OK;
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return ret;
}
return ret;
@@
-800,6
+812,8
@@
int extract_canvasid(arg_list_t &arg_list,string &canvasid)
canvasid=*iter;
arg_list.erase(iter);
}
canvasid=*iter;
arg_list.erase(iter);
}
+ else if (flag_requires_value(*iter))
+ iter=next++;
}
return SYNFIGTOOL_OK;
}
return SYNFIGTOOL_OK;