Changes due to the compilation on Linux

diff --git a/src/ImageComposer/ImageComposer_Operator.cxx b/src/ImageComposer/ImageComposer_Operator.cxx
index 882015e3f73d35c3260c8946aa5b6e5a3b9cdfb8..2bf7f219c56ac29bdf1736fc0e6fa480c1819484 100644 (file)
--- a/src/ImageComposer/ImageComposer_Operator.cxx
+++ b/src/ImageComposer/ImageComposer_Operator.cxx
@@ -64,7 +64,7 @@ ImageComposer_Image ImageComposer_Operator::process( const ImageComposer_Image&
   anImage1.setTransform( anImage1.transform() * aTranslate );
   anImage2.setTransform( anImage2.transform() * aTranslate );
 
-  QPixmap aResultImage( aBounds.width(), aBounds.height() );
+  QPixmap aResultImage( int(aBounds.width()), int(aBounds.height()) );
   aResultImage.fill( myBackground );
 
   QPainter aPainter( &aResultImage );

diff --git a/src/ImageComposer/Makefile.am b/src/ImageComposer/Makefile.am
index cbae5a4c4b8eac6c3a37c2af780e62dd28f90063..889c70cc5ce5813a4b1b3b4cbfce9ff8be741da3 100644 (file)
--- a/src/ImageComposer/Makefile.am
+++ b/src/ImageComposer/Makefile.am
@@ -28,8 +28,7 @@ ImageComposer_CropOperator.h          \
 ImageComposer_CutOperator.h            \
 ImageComposer_FuseOperator.h           \
 ImageComposer_Image.h                  \
-ImageComposer_Operator.h               \
-ImageComposer_Tools.h
+ImageComposer_Operator.h
 
 dist_libImageComposer_la_SOURCES =     \
 ImageComposer_ColorMaskOperator.cxx    \
@@ -37,8 +36,7 @@ ImageComposer_CropOperator.cxx                \
 ImageComposer_CutOperator.cxx          \
 ImageComposer_FuseOperator.cxx         \
 ImageComposer_Image.cxx                        \
-ImageComposer_Operator.cxx             \
-ImageComposer_Tools.cxx
+ImageComposer_Operator.cxx
 
 libImageComposer_la_CPPFLAGS = $(QT_INCLUDES)
 libImageComposer_la_LDFLAGS  = $(QT_MT_LIBS)