← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h
168
168
      array_((n <= kInlineElements
169
169
              ? reinterpret_cast<InnerContainer*>(inline_space_)
170
170
              : new InnerContainer[n])) {
171
 
  DCHECK_GE(n, 0);
 
171
  DCHECK_GE(n, size_t(0));
172
172
 
173
173
  // Construct only the elements actually used.
174
174
  if (array_ == reinterpret_cast<InnerContainer*>(inline_space_)) {
175
 
    for (int i = 0; i != size_; ++i) {
 
175
    for (size_t i = 0; i != size_; ++i) {
176
176
      inline_space_[i].Init();
177
177
    }
178
178
  }
183
183
  if (array_ != reinterpret_cast<InnerContainer*>(inline_space_)) {
184
184
    delete[] array_;
185
185
  } else {
186
 
    for (int i = 0; i != size_; ++i) {
 
186
    for (size_t i = 0; i != size_; ++i) {
187
187
      inline_space_[i].Destroy();
188
188
    }
189
189
  }