Normalize line endings and whitespace

This commit is contained in:
OpenCV Buildbot
2012-10-17 11:12:04 +04:00
committed by Andrey Kamaev
parent 0442bca235
commit 81f826db2b
1511 changed files with 258678 additions and 258624 deletions

View File

@@ -1,9 +1,9 @@
///////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2007, Weta Digital Ltd
//
//
// All rights reserved.
//
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -15,8 +15,8 @@
// distribution.
// * Neither the name of Weta Digital nor the names of
// its contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -63,7 +63,7 @@ StringVectorAttribute::writeValueTo (OStream &os, int) const
{
int strSize = _value[i].size();
Xdr::write <StreamIO> (os, strSize);
Xdr::write <StreamIO> (os, &_value[i][0], strSize);
Xdr::write <StreamIO> (os, &_value[i][0], strSize);
}
}
@@ -75,14 +75,14 @@ StringVectorAttribute::readValueFrom (IStream &is, int size, int)
int read = 0;
while (read < size)
{
{
int strSize;
Xdr::read <StreamIO> (is, strSize);
read += Xdr::size<int>();
read += Xdr::size<int>();
std::string str;
str.resize (strSize);
Xdr::read<StreamIO> (is, &str[0], strSize);
read += strSize;