Commit 9a3f9a77 authored by Victor Poughon's avatar Victor Poughon Committed by Guillaume Pasero

WIP: extern templates

Conflicts:
	Modules/Core/ImageBase/include/otbImage.h
	Modules/Core/ImageBase/include/otbVectorImage.h
	Modules/IO/ImageIO/include/otbImageFileReader.h
	Modules/IO/ImageIO/include/otbImageFileWriter.h
parent 6b4d348c
......@@ -274,4 +274,13 @@ private:
#include "otbImage.hxx"
#endif
namespace otb {
extern template class Image<unsigned int, 2>;
extern template class Image<int, 2>;
extern template class Image<unsigned char, 2>;
extern template class Image<char, 2>;
extern template class Image<float, 2>;
extern template class Image<double, 2>;
}
#endif
......@@ -215,4 +215,13 @@ private:
#include "otbVectorImage.hxx"
#endif
namespace otb {
extern template class VectorImage<unsigned int, 2>;
extern template class VectorImage<int, 2>;
extern template class VectorImage<unsigned char, 2>;
extern template class VectorImage<char, 2>;
extern template class VectorImage<float, 2>;
extern template class VectorImage<double, 2>;
}
#endif
......@@ -20,6 +20,8 @@
set(OTBImageBase_SRC
otbImageIOBase.cxx
otbImage.cxx
otbVectorImage.cxx
)
add_library(OTBImageBase ${OTBImageBase_SRC})
......
/*
* Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
*
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "otbImage.h"
namespace otb {
template class Image<unsigned int, 2>;
template class Image<int, 2>;
template class Image<unsigned char, 2>;
template class Image<char, 2>;
template class Image<float, 2>;
template class Image<double, 2>;
}
/*
* Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
*
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "otbVectorImage.h"
namespace otb {
template class VectorImage<unsigned int, 2>;
template class VectorImage<int, 2>;
template class VectorImage<unsigned char, 2>;
template class VectorImage<char, 2>;
template class VectorImage<float, 2>;
template class VectorImage<double, 2>;
}
......@@ -212,4 +212,17 @@ private:
#include "otbImageFileReader.hxx"
#endif
#include "otbImage.h"
#include "otbVectorImage.h"
namespace otb {
extern template class ImageFileReader<Image<unsigned int, 2>>;
extern template class ImageFileReader<Image<int, 2>>;
extern template class ImageFileReader<Image<unsigned char, 2>>;
extern template class ImageFileReader<Image<char, 2>>;
extern template class ImageFileReader<Image<float, 2>>;
extern template class ImageFileReader<Image<double, 2>>;
// TODO add vector image
}
#endif // otbImageFileReader_h
......@@ -290,4 +290,17 @@ private:
#include "otbImageFileWriter.hxx"
#endif
#include "otbImage.h"
#include "otbVectorImage.h"
namespace otb {
extern template class ImageFileWriter<otb::Image<unsigned int, 2>>;
extern template class ImageFileWriter<otb::Image<int, 2>>;
extern template class ImageFileWriter<otb::Image<unsigned char, 2>>;
extern template class ImageFileWriter<otb::Image<char, 2>>;
extern template class ImageFileWriter<otb::Image<float, 2>>;
extern template class ImageFileWriter<otb::Image<double, 2>>;
// TODO add vector image
}
#endif
......@@ -21,6 +21,8 @@
set(OTBImageIO_SRC
otbImageIOFactory.cxx
otbMultiImageFileWriter.cxx
otbImageFileReader.cxx
otbImageFileWriter.cxx
)
add_library(OTBImageIO ${OTBImageIO_SRC})
......
/*
* Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
*
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "otbImageFileReader.h"
namespace otb {
template class ImageFileReader<otb::Image<unsigned int, 2>>;
template class ImageFileReader<otb::Image<int, 2>>;
template class ImageFileReader<otb::Image<unsigned char, 2>>;
template class ImageFileReader<otb::Image<char, 2>>;
template class ImageFileReader<otb::Image<float, 2>>;
template class ImageFileReader<otb::Image<double, 2>>;
}
/*
* Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
*
* This file is part of Orfeo Toolbox
*
* https://www.orfeo-toolbox.org/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "otbImageFileWriter.h"
namespace otb {
template class ImageFileWriter<Image<unsigned int, 2>>;
template class ImageFileWriter<Image<int, 2>>;
template class ImageFileWriter<Image<unsigned char, 2>>;
template class ImageFileWriter<Image<char, 2>>;
template class ImageFileWriter<Image<float, 2>>;
template class ImageFileWriter<Image<double, 2>>;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment