From d3fb2cea9ccc913325f5fefb994fabb396ca13d1 Mon Sep 17 00:00:00 2001
From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 23 Mar 2010 06:58:46 +0000
Subject: [PATCH] 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
---
modules/base/src/profile.hh | 4 +--
modules/gui/src/panel_bar/button_bar.hh | 2 +-
modules/img/alg/src/rscrosscorr.cc | 27 +++++++++++++++--
modules/img/alg/src/rscrosscorr.hh | 40 +++++++++++++++++++------
4 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/modules/base/src/profile.hh b/modules/base/src/profile.hh
index a585738aa..44b21b1f4 100644
--- a/modules/base/src/profile.hh
+++ b/modules/base/src/profile.hh
@@ -29,7 +29,7 @@ namespace ost {
#if OST_PROFILING_ENABLED==0 || defined(WIN32)
-class Profile {
+class DLLEXPORT_OST_BASE Profile {
public:
Profile(const String&) {}
~Profile() {}
@@ -37,7 +37,7 @@ public:
#else
-class Profile {
+class DLLEXPORT_OST_BASE Profile {
public:
Profile(const String& msg);
~Profile();
diff --git a/modules/gui/src/panel_bar/button_bar.hh b/modules/gui/src/panel_bar/button_bar.hh
index b542a14b0..578769349 100644
--- a/modules/gui/src/panel_bar/button_bar.hh
+++ b/modules/gui/src/panel_bar/button_bar.hh
@@ -33,7 +33,7 @@
namespace ost { namespace gui {
/// \brief button box
-class ButtonBar : public Widget {
+class DLLEXPORT_OST_GUI ButtonBar : public Widget {
Q_OBJECT
public:
ButtonBar(QWidget* parent=NULL);
diff --git a/modules/img/alg/src/rscrosscorr.cc b/modules/img/alg/src/rscrosscorr.cc
index e45488241..e42aa25cc 100644
--- a/modules/img/alg/src/rscrosscorr.cc
+++ b/modules/img/alg/src/rscrosscorr.cc
@@ -1,7 +1,29 @@
+//------------------------------------------------------------------------------
+// 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/alg/rscrosscorr.hh>
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 image2_overlap=Overlap(image2.GetExtent(),extent);
@@ -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());
}
diff --git a/modules/img/alg/src/rscrosscorr.hh b/modules/img/alg/src/rscrosscorr.hh
index 77b87381f..78269d3bf 100644
--- a/modules/img/alg/src/rscrosscorr.hh
+++ b/modules/img/alg/src/rscrosscorr.hh
@@ -1,19 +1,41 @@
+//------------------------------------------------------------------------------
+// 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
#define IMG_ALG_REAL_SPACE_CROSSCORR_HH
#include <ost/img/image.hh>
-
+#include <ost/img/alg/module_config.hh>
namespace ost { namespace img { namespace alg {
-//! Computes cross correlation of images
-/*! Both input images must be Real Spatial their extent should be the same. */
-Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1, const ConstImageHandle& image2);
+/// \brief Computes cross correlation of images
+/// Both input images must be Real Spatial their extent should be the same.
+Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1,
+ const ConstImageHandle& image2);
-//! Computes cross correlation of images
-/*! 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. */
-Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1, const ConstImageHandle& image2, const img::Extent& extent);
+/// \brief Computes cross correlation of images
+/// 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.
+Real DLLEXPORT_IMG_ALG RealSpatialCrossCorrelation(const ConstImageHandle& image1,
+ const ConstImageHandle& image2,
+ const img::Extent& extent);
}}} // ns
--
GitLab