diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-11-08 02:04:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-08 02:04:52 +0000 |
| commit | 5b81755890a9dd425226b1d32ca9419ccbf02ba2 (patch) | |
| tree | e29e1acf8be984c7fa82847876d1608098821412 /emulator | |
| parent | 01b06e3bb5eefa8681433d903b1c409ac23840c5 (diff) | |
| parent | 69f2fc8e6b4017605086aeab45bf1ad61bb66c7d (diff) | |
| download | sdk-5b81755890a9dd425226b1d32ca9419ccbf02ba2.zip sdk-5b81755890a9dd425226b1d32ca9419ccbf02ba2.tar.gz sdk-5b81755890a9dd425226b1d32ca9419ccbf02ba2.tar.bz2 | |
Merge changes I0cccba67,I4cf8a19b
* changes:
Ignore empty ranges
Fix rangeUnion return value in the successful case
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/RangeManip.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/RangeManip.cpp b/emulator/opengl/host/libs/Translator/GLcommon/RangeManip.cpp index 5ba609b..2d6f119 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/RangeManip.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/RangeManip.cpp @@ -35,13 +35,14 @@ bool Range::rangeUnion(const Range& r,Range& rOut) const { int size = max_end - min_start; if(size) { rOut.setRange(min_start,max_end-min_start); - return false; + return true; } return false; } void RangeList::addRange(const Range& r) { - list.push_back(r); + if(r.getSize()) + list.push_back(r); } void RangeList::addRanges(const RangeList& rl) { |