Skip to content
Snippets Groups Projects
Commit d3fb2cea authored by marco's avatar marco
Browse files

fixes to link with -fvsibility=hidden on Mac

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1872 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent 9ee59e5a
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ namespace ost { ...@@ -29,7 +29,7 @@ namespace ost {
#if OST_PROFILING_ENABLED==0 || defined(WIN32) #if OST_PROFILING_ENABLED==0 || defined(WIN32)
class Profile { class DLLEXPORT_OST_BASE Profile {
public: public:
Profile(const String&) {} Profile(const String&) {}
~Profile() {} ~Profile() {}
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
#else #else
class Profile { class DLLEXPORT_OST_BASE Profile {
public: public:
Profile(const String& msg); Profile(const String& msg);
~Profile(); ~Profile();
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
namespace ost { namespace gui { namespace ost { namespace gui {
/// \brief button box /// \brief button box
class ButtonBar : public Widget { class DLLEXPORT_OST_GUI ButtonBar : public Widget {
Q_OBJECT Q_OBJECT
public: public:
ButtonBar(QWidget* parent=NULL); ButtonBar(QWidget* parent=NULL);
......
//------------------------------------------------------------------------------
// This file is part of the OpenStructure project <www.openstructure.org>
//
// Copyright (C) 2008-2010 by the OpenStructure authors
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License as published by the Free
// Software Foundation; either version 3.0 of the License, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
// details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
#include <ost/img/image_state.hh> #include <ost/img/image_state.hh>
#include <ost/img/alg/rscrosscorr.hh>
namespace ost { namespace img { namespace alg { namespace ost { namespace img { namespace alg {
Real RealSpatialCrossCorrelation(const img::ConstImageHandle& image1, const img::ConstImageHandle& image2, const img::Extent& extent)
Real RealSpatialCrossCorrelation(const ConstImageHandle& image1,
const ConstImageHandle& image2,
const Extent& extent)
{ {
img::Extent image1_overlap=Overlap(image1.GetExtent(),extent); img::Extent image1_overlap=Overlap(image1.GetExtent(),extent);
img::Extent image2_overlap=Overlap(image2.GetExtent(),extent); img::Extent image2_overlap=Overlap(image2.GetExtent(),extent);
...@@ -44,7 +66,8 @@ Real RealSpatialCrossCorrelation(const img::ConstImageHandle& image1, const img: ...@@ -44,7 +66,8 @@ Real RealSpatialCrossCorrelation(const img::ConstImageHandle& image1, const img:
} }
} }
Real RealSpatialCrossCorrelation(const img::ConstImageHandle& image1, const img::ConstImageHandle& image2) Real RealSpatialCrossCorrelation(const ConstImageHandle& image1,
const ConstImageHandle& image2)
{ {
return RealSpatialCrossCorrelation(image1, image2, image2.GetExtent()); return RealSpatialCrossCorrelation(image1, image2, image2.GetExtent());
} }
......
//------------------------------------------------------------------------------
// This file is part of the OpenStructure project <www.openstructure.org>
//
// Copyright (C) 2008-2010 by the OpenStructure authors
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License as published by the Free
// Software Foundation; either version 3.0 of the License, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
// details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this library; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
#ifndef IMG_ALG_REAL_SPACE_CROSSCORR_HH #ifndef IMG_ALG_REAL_SPACE_CROSSCORR_HH
#define IMG_ALG_REAL_SPACE_CROSSCORR_HH #define IMG_ALG_REAL_SPACE_CROSSCORR_HH
#include <ost/img/image.hh> #include <ost/img/image.hh>
#include <ost/img/alg/module_config.hh>
namespace ost { namespace img { namespace alg { namespace ost { namespace img { namespace alg {
//! Computes cross correlation of images /// \brief Computes cross correlation of images
/*! Both input images must be Real Spatial their extent should be the same. */ /// Both input images must be Real Spatial their extent should be the same.
Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1, const ConstImageHandle& image2); Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1,
const ConstImageHandle& image2);
//! Computes cross correlation of images /// \brief Computes cross correlation of images
/*! the cross correlation is computed only within the given extent. /// the cross correlation is computed only within the given extent.
///
Both input images must be Real Spatial and their overlap with the given extent should be the same. */ /// Both input images must be Real Spatial and their overlap with the given
Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1, const ConstImageHandle& image2, const img::Extent& extent); /// extent should be the same.
Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1,
const ConstImageHandle& image2,
const img::Extent& extent);
}}} // ns }}} // ns
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment