Permalink
Browse files

Rip off band-aid and make all whitespace consistent

This removes all EOL whitespace and converts tabs to the numbers of spaces
the file author intended (to not screw up indentation).
  • Loading branch information...
1 parent 2d68b1c commit 4704e96df22de7d72ed99cb40a9c5829d326b125 @novas0x2a novas0x2a committed Oct 11, 2010
Showing 335 changed files with 4,378 additions and 4,405 deletions.
View
@@ -25,16 +25,16 @@ ABBREVIATE_BRIEF = "The $name class" \
ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 4
-ALIASES =
+ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
BUILTIN_STL_SUPPORT = YES
@@ -64,11 +64,11 @@ GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -78,22 +78,22 @@ WARN_IF_UNDOCUMENTED = NO
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = vw vw/Core vw/Image vw/Math vw/FileIO vw/Camera vw/HDR vw/Mosaic vw/Cartography vw/GPU vw/Geometry
FILE_PATTERNS = *.h
RECURSIVE = NO
-EXCLUDE =
+EXCLUDE =
EXCLUDE_SYMLINKS = YES
-EXCLUDE_PATTERNS =
+EXCLUDE_PATTERNS =
EXAMPLE_PATH = vw/tests vw/Core/tests vw/Image/tests vw/Math/tests vw/FileIO/tests vw/Camera/tests vw/HDR/tests vw/Mosaic/tests vw/Cartography/tests
EXAMPLE_PATTERNS = Test*.h
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
@@ -110,20 +110,20 @@ VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = doxygen
HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
+CHM_FILE =
+HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
@@ -140,8 +140,8 @@ LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = letter
-EXTRA_PACKAGES =
-LATEX_HEADER =
+EXTRA_PACKAGES =
+LATEX_HEADER =
PDF_HYPERLINKS = YES
USE_PDFLATEX = YES
LATEX_BATCHMODE = NO
@@ -153,8 +153,8 @@ GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
@@ -167,8 +167,8 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
GENERATE_XML = NO
XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
+XML_SCHEMA =
+XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
@@ -180,29 +180,29 @@ GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
+TAGFILES =
+GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO
HIDE_UNDOC_RELATIONS = YES
@@ -218,7 +218,7 @@ CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
-DOTFILE_DIRS =
+DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_DEPTH = 1000
@@ -227,6 +227,6 @@ DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = YES
@@ -20,7 +20,7 @@ TEST( ControlNetworkLoad, LoadingGCPNET ) {
std::vector<std::string> image_names;
image_names.push_back("image1");
image_names.push_back("image2");
-
+
// Creating GCP net
UnlinkName gcpnet("test.cnet");
std::list<std::string> gcpnets;
@@ -60,9 +60,9 @@ TEST( ControlNetworkLoad, LoadingGCPNET ) {
EXPECT_TRUE( boost::filesystem::exists( gcpnets.front() ) );
EXPECT_EQ( 1, net.size() );
EXPECT_EQ( 1, gcpnets.size() );
-
+
add_ground_control_cnets( net, image_names,
- gcpnets.begin(), gcpnets.end() );
+ gcpnets.begin(), gcpnets.end() );
ASSERT_EQ( 2, net.size() );
EXPECT_EQ( ControlPoint::GroundControlPoint, net[1].type() );
@@ -6,9 +6,9 @@
/// \file BayerFilter.h
-///
+///
/// This function performs a bayer pattern decoding of a grayscale image..
-///
+///
#ifndef __VW_CAMERA_BAYER__
#define __VW_CAMERA_BAYER__
@@ -21,7 +21,7 @@ namespace vw {
namespace camera {
template <class ViewT>
- ImageView<PixelRGB<typename CompoundChannelType<typename ViewT::pixel_type>::type > >
+ ImageView<PixelRGB<typename CompoundChannelType<typename ViewT::pixel_type>::type > >
inverse_bayer_filter(ImageViewBase<ViewT > const& view_) {
typedef typename CompoundChannelType<typename ViewT::pixel_type>::type channel_type;
const EdgeExtensionView<ViewT, ZeroEdgeExtension> view = edge_extend(view_.impl(), ZeroEdgeExtension());
View
@@ -6,9 +6,9 @@
/// \file Cartography.h
-///
+///
/// A convenience header that includes the header files in vw/Cartography.
-///
+///
#ifndef __VW_CARTOGRAPHY_H__
#define __VW_CARTOGRAPHY_H__
@@ -30,4 +30,4 @@
#endif
#endif // __VW_CARTOGRAPHY_H__
-
+
@@ -32,24 +32,24 @@ void vw::cartography::Datum::set_well_known_datum( std::string const& name ) {
m_geocentric = false;
m_meridian_offset = 0;
- if (name == "WGS84") {
+ if (name == "WGS84") {
m_name = "WGS_1984";
m_spheroid_name="WGS 84";
m_semi_major_axis = 6378137.0;
m_semi_minor_axis = 6356752.3;
m_proj_str = "+ellps=WGS84 +datum=WGS84";
return;
- }
-
+ }
+
if (name == "WGS72") {
m_name="WGS_1972";
m_spheroid_name="WGS 72";
m_semi_major_axis = 6378135.0;
m_semi_minor_axis = 6356750.5;
m_proj_str = "+ellps=WGS72 +towgs84=0,0,4.5,0,0,0.554,0.2263";
return;
- }
-
+ }
+
if (name == "NAD83") {
m_name="North_American_Datum_1983";
m_spheroid_name="GRS 1980";
@@ -93,16 +93,16 @@ void vw::cartography::Datum::set_well_known_datum( std::string const& name ) {
vw::vw_throw( vw::InputErr() << "Unknown datum string \"" << name << "\"!");
}
-void vw::cartography::Datum::set_semi_major_axis(double val) {
- m_semi_major_axis = val;
+void vw::cartography::Datum::set_semi_major_axis(double val) {
+ m_semi_major_axis = val;
std::ostringstream strm;
strm << "+a=" << m_semi_major_axis << " +b=" << m_semi_minor_axis;
if (m_geocentric) strm << " +geoc";
m_proj_str = strm.str();
}
-void vw::cartography::Datum::set_semi_minor_axis(double val) {
- m_semi_minor_axis = val;
+void vw::cartography::Datum::set_semi_minor_axis(double val) {
+ m_semi_minor_axis = val;
std::ostringstream strm;
strm << "+a=" << m_semi_major_axis << " +b=" << m_semi_minor_axis;
if (m_geocentric) strm << " +geoc";
@@ -114,8 +114,8 @@ double vw::cartography::Datum::radius(double /*lon*/, double lat) const {
// Optimize in the case of spherical datum
if (m_semi_major_axis == m_semi_minor_axis) {
return m_semi_major_axis;
- }
-
+ }
+
// Bi-axial Ellpisoid datum
double a = m_semi_major_axis;
double b = m_semi_minor_axis;
@@ -129,8 +129,8 @@ double vw::cartography::Datum::geocentric_latitude(double lat) const {
// Optimize in the case of spherical datum
if (m_semi_major_axis == m_semi_minor_axis) {
return m_semi_major_axis;
- }
-
+ }
+
// Bi-axial Ellpisoid datum
// http://mathworld.wolfram.com/GeocentricLatitude.html
double a = m_semi_major_axis;
@@ -215,7 +215,7 @@ vw::Vector3 vw::cartography::Datum::geodetic_to_cartesian( vw::Vector3 const& p
double a2 = a * a;
double b2 = b * b;
double e2 = (a2 - b2) / a2;
-
+
double lat = p.y();
if ( lat < -90 ) lat = -90;
if ( lat > 90 ) lat = 90;
@@ -234,7 +234,7 @@ vw::Vector3 vw::cartography::Datum::geodetic_to_cartesian( vw::Vector3 const& p
}
-// This function is based heavily on the similar
+// This function is based heavily on the similar
// Proj.4 function pj_Convert_Geocentric_To_Geodetic.
vw::Vector3 vw::cartography::Datum::cartesian_to_geodetic( vw::Vector3 const& p ) const {
double a = m_semi_major_axis;
@@ -246,10 +246,10 @@ vw::Vector3 vw::cartography::Datum::cartesian_to_geodetic( vw::Vector3 const& p
static const double epsilon = 1.0e-12;
static const double epsilon2 = epsilon*epsilon;
static const int maxiter = 30;
-
+
double normxy = sqrt(p.x()*p.x()+p.y()*p.y()); // distance between semi-minor axis and location
double normp = norm_2(p); // distance between center and location
-
+
double lon=0.0, alt=0.0;
// compute the longitude
@@ -262,7 +262,7 @@ vw::Vector3 vw::cartography::Datum::cartesian_to_geodetic( vw::Vector3 const& p
else {
lon = atan2(p.y(),p.x()) / (M_PI/180);
}
-
+
// The following iterative algorithm was developped by
// "Institut fur Erdmessung", University of Hannover, July 1988.
// Internet: www.ife.uni-hannover.de
@@ -271,7 +271,7 @@ vw::Vector3 vw::cartography::Datum::cartesian_to_geodetic( vw::Vector3 const& p
double rx = 1.0/sqrt(1.0-e2*(2.0-e2)*cgcl*cgcl);
double clat = cgcl*(1.0-e2)*rx; // cos of geodetic latitude estimate
double slat = sgcl*rx; // sin of geodetic latitude estimate
-
+
// loop to find lat (in quadrature) until |lat[i]-lat[i-1]|<epsilon, roughly
for( int i=0; i<maxiter; ++i ) {
double ri = a/sqrt(1.0-e2*slat*slat); // radius at estimated location
@@ -286,12 +286,12 @@ vw::Vector3 vw::cartography::Datum::cartesian_to_geodetic( vw::Vector3 const& p
slat = new_slat;
if( sdlat*sdlat < epsilon2 ) break;
}
-
+
return Vector3( lon - m_meridian_offset, atan(slat/fabs(clat))/(M_PI/180), alt );
}
std::ostream& vw::cartography::operator<<( std::ostream& os, vw::cartography::Datum const& datum ) {
- os << "Geodeditic Datum --> Name: " << datum.name() << " Spheroid: " << datum.spheroid_name()
+ os << "Geodeditic Datum --> Name: " << datum.name() << " Spheroid: " << datum.spheroid_name()
<< " Semi-major: " << datum.semi_major_axis()
<< " Semi-minor: " << datum.semi_minor_axis()
<< " Meridian: " << datum.meridian_name()
Oops, something went wrong.

0 comments on commit 4704e96

Please sign in to comment.