Merge lp://qastaging/~mc-return/compiz/compiz.fix1030473-part2 into lp://qastaging/compiz/0.9.8
Proposed by
MC Return
| Status: | Merged |
|---|---|
| Approved by: | Daniel van Vugt |
| Approved revision: | 3315 |
| Merged at revision: | 3302 |
| Proposed branch: | lp://qastaging/~mc-return/compiz/compiz.fix1030473-part2 |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
242 lines (+21/-21) 16 files modified
compizconfig/libcompizconfig/src/iniparser.c (+1/-1) plugins/animation/src/extensionplugin.cpp (+3/-3) plugins/colorfilter/src/colorfilter.cpp (+1/-1) plugins/colorfilter/src/parser.cpp (+1/-1) plugins/dbus/src/dbus.cpp (+1/-1) plugins/decor/src/decor.cpp (+1/-1) plugins/firepaint/src/firepaint.cpp (+2/-2) plugins/grid/src/grid.cpp (+1/-1) plugins/group/src/init.cpp (+2/-2) plugins/opacify/src/opacify.cpp (+1/-1) plugins/ring/src/ring.cpp (+1/-1) plugins/scale/src/scale.cpp (+1/-1) plugins/thumbnail/src/thumbnail.cpp (+1/-1) plugins/wallpaper/src/wallpaper.cpp (+2/-2) src/match.cpp (+1/-1) src/screen.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mc-return/compiz/compiz.fix1030473-part2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Approve | ||
| Sam Spilsbury | Approve | ||
|
Review via email:
|
|||
Commit message
Fixed various problems described in bug 1030473.
Optimized performance and style following suggestions reported by cppcheck:
1. Used !xxxx.empty() instead of xxxx.size(), because it can be faster. xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.
2. Defensive programming: Reordered array-out-of-bound condition checks such as '(a[i] && i < 10)' to '(i < 10 && a[i])'. That way the array will not be accessed, because the index is checked first.
Description of the change
Fixes various problems described in bug 1030473.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM