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

@@ -2,9 +2,9 @@
//
// Copyright (c) 2002, Industrial Light & Magic, a division of Lucas
// Digital Ltd. LLC
//
//
// All rights reserved.
//
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -16,8 +16,8 @@
// distribution.
// * Neither the name of Industrial Light & Magic 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
@@ -50,12 +50,12 @@ using namespace std;
namespace Imf {
Slice::Slice (PixelType t,
char *b,
size_t xst,
size_t yst,
int xsm,
int ysm,
double fv,
char *b,
size_t xst,
size_t yst,
int xsm,
int ysm,
double fv,
bool xtc,
bool ytc)
:
@@ -73,20 +73,20 @@ Slice::Slice (PixelType t,
}
void
void
FrameBuffer::insert (const char name[], const Slice &slice)
{
if (name[0] == 0)
{
THROW (Iex::ArgExc,
"Frame buffer slice name cannot be an empty string.");
THROW (Iex::ArgExc,
"Frame buffer slice name cannot be an empty string.");
}
_map[name] = slice;
}
void
void
FrameBuffer::insert (const string &name, const Slice &slice)
{
insert (name.c_str(), slice);
@@ -100,8 +100,8 @@ FrameBuffer::operator [] (const char name[])
if (i == _map.end())
{
THROW (Iex::ArgExc,
"Cannot find frame buffer slice \"" << name << "\".");
THROW (Iex::ArgExc,
"Cannot find frame buffer slice \"" << name << "\".");
}
return i->second;
@@ -115,8 +115,8 @@ FrameBuffer::operator [] (const char name[]) const
if (i == _map.end())
{
THROW (Iex::ArgExc,
"Cannot find frame buffer slice \"" << name << "\".");
THROW (Iex::ArgExc,
"Cannot find frame buffer slice \"" << name << "\".");
}
return i->second;
@@ -167,14 +167,14 @@ FrameBuffer::findSlice (const string &name) const
}
FrameBuffer::Iterator
FrameBuffer::Iterator
FrameBuffer::begin ()
{
return _map.begin();
}
FrameBuffer::ConstIterator
FrameBuffer::ConstIterator
FrameBuffer::begin () const
{
return _map.begin();
@@ -188,7 +188,7 @@ FrameBuffer::end ()
}
FrameBuffer::ConstIterator
FrameBuffer::ConstIterator
FrameBuffer::end () const
{
return _map.end();