[med-svn] r6587 - trunk/packages/gofigure2/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-19 06:30:38 +0000 (Tue, 19 Apr 2011)
New Revision: 6587

Modified:
   trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
   trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch
Log:
Fix other comp error on armel

Modified: trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-04-18 19:43:25 UTC (rev 6586)
+++ trunk/packages/gofigure2/trunk/debian/patches/apple_bundle_fix.patch	2011-04-19 06:30:38 UTC (rev 6587)
@@ -1,8 +1,8 @@
-Index: GoFigure2-v0.8.0/Main/CMakeLists.txt
+Index: GoFigure2-v0.8.1/Main/CMakeLists.txt
 ===================================================================
---- GoFigure2-v0.8.0.orig/Main/CMakeLists.txt	2011-03-11 14:30:14.000000000 +0100
-+++ GoFigure2-v0.8.0/Main/CMakeLists.txt	2011-03-11 14:30:51.000000000 +0100
-@@ -295,6 +295,7 @@
+--- GoFigure2-v0.8.1.orig/Main/CMakeLists.txt	2011-03-29 21:41:05.000000000 +0200
++++ GoFigure2-v0.8.1/Main/CMakeLists.txt	2011-04-19 08:27:48.000000000 +0200
+@@ -307,6 +307,7 @@
  # install(SCRIPT  ...).
  # Note that the image plugins depend on QtSvg and QtXml, and it got those
  # copied over.
@@ -10,7 +10,7 @@
  INSTALL( CODE "
      file( GLOB_RECURSE QTPLUGINS
      \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\" )
-@@ -303,7 +304,6 @@
+@@ -315,7 +316,6 @@
    "
    COMPONENT Runtime )
  

Modified: trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch
===================================================================
--- trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch	2011-04-18 19:43:25 UTC (rev 6586)
+++ trunk/packages/gofigure2/trunk/debian/patches/qreal_getrgb.patch	2011-04-19 06:30:38 UTC (rev 6587)
@@ -1,7 +1,7 @@
-Index: GoFigure2-v0.8.0/Code/GUI/lib/TraceContainerBase.txx
+Index: GoFigure2-v0.8.1/Code/GUI/lib/TraceContainerBase.txx
 ===================================================================
---- GoFigure2-v0.8.0.orig/Code/GUI/lib/TraceContainerBase.txx	2011-04-18 21:07:00.000000000 +0200
-+++ GoFigure2-v0.8.0/Code/GUI/lib/TraceContainerBase.txx	2011-04-18 21:07:12.000000000 +0200
+--- GoFigure2-v0.8.1.orig/Code/GUI/lib/TraceContainerBase.txx	2011-03-29 21:41:05.000000000 +0200
++++ GoFigure2-v0.8.1/Code/GUI/lib/TraceContainerBase.txx	2011-04-19 08:29:14.000000000 +0200
 @@ -466,7 +466,7 @@
    boost::tuples::tie(it0, it1) =
      m_Container.get< Highlighted >().equal_range(true);
@@ -11,3 +11,91 @@
  
    if ( iColor.isValid() )
      {
+@@ -993,4 +993,4 @@
+ 
+ //-------------------------------------------------------------------------
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoImageView.cxx
+===================================================================
+--- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoImageView.cxx	2011-04-19 08:29:42.000000000 +0200
++++ GoFigure2-v0.8.1/Code/GUI/lib/QGoImageView.cxx	2011-04-19 08:29:37.000000000 +0200
+@@ -200,7 +200,7 @@
+ void
+ QGoImageView::SetBackgroundColor(const QColor & iColor)
+ {
+-  double r, g, b;
++  qreal r, g, b;
+ 
+   iColor.getRgbF(&r, &g, &b);
+ 
+@@ -704,13 +704,13 @@
+   m_NodesColor = nodecolor;
+   m_ActiveNodesColor = activenodecolor;
+ 
+-  double rl, gl, bl;
++  qreal rl, gl, bl;
+   linecolor.getRgbF(&rl, &gl, &bl);
+ 
+-  double rn, gn, bn;
++  qreal rn, gn, bn;
+   nodecolor.getRgbF(&rn, &gn, &bn);
+ 
+-  double ra, ga, ba;
++  qreal ra, ga, ba;
+   activenodecolor.getRgbF(&ra, &ga, &ba);
+ 
+   std::vector< vtkSmartPointer< vtkOrientedGlyphContourRepresentation > >::iterator
+@@ -761,4 +761,4 @@
+     ++it;
+     ++i;
+     }
+-}
+\ No newline at end of file
++}
+Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageView4D.cxx
+===================================================================
+--- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoTabImageView4D.cxx	2011-04-19 08:29:42.000000000 +0200
++++ GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageView4D.cxx	2011-04-19 08:28:58.000000000 +0200
+@@ -1097,14 +1097,14 @@
+   QColor activenodecolor; // =
+                           // m_ManualSegmentationWidget->GetActiveNodesColor();
+ 
+-  double rl, gl, bl;
++  qreal rl, gl, bl;
+ 
+   linecolor.getRgbF(&rl, &gl, &bl);
+ 
+-  double rn, gn, bn;
++  qreal rn, gn, bn;
+   nodecolor.getRgbF(&rn, &gn, &bn);
+ 
+-  double ra, ga, ba;
++  qreal ra, ga, ba;
+   activenodecolor.getRgbF(&ra, &ga, &ba);
+ 
+   for ( unsigned int i = 0; i < m_ContourRepresentation.size(); i++ )
+Index: GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageViewElementBase.cxx
+===================================================================
+--- GoFigure2-v0.8.1.orig/Code/GUI/lib/QGoTabImageViewElementBase.cxx	2011-04-19 08:29:42.000000000 +0200
++++ GoFigure2-v0.8.1/Code/GUI/lib/QGoTabImageViewElementBase.cxx	2011-04-19 08:28:40.000000000 +0200
+@@ -127,14 +127,14 @@
+   QColor nodecolor = m_NodesColor;
+   QColor activenodecolor = m_ActiveNodesColor;
+ 
+-  double rl, gl, bl;
++  qreal rl, gl, bl;
+ 
+   linecolor.getRgbF(&rl, &gl, &bl);
+ 
+-  double rn, gn, bn;
++  qreal rn, gn, bn;
+   nodecolor.getRgbF(&rn, &gn, &bn);
+ 
+-  double ra, ga, ba;
++  qreal ra, ga, ba;
+   activenodecolor.getRgbF(&ra, &ga, &ba);
+ 
+   for ( unsigned int i = 0; i < m_ContourRepresentation.size(); i++ )