From 72f7be97e5ef3efa5a1fca45be44aaa969f4aeaf Mon Sep 17 00:00:00 2001 From: mpv Date: Wed, 17 Jul 2013 07:07:33 +0000 Subject: [PATCH] Changes due to the compilation on Linux --- src/ImageComposer/ImageComposer_Operator.cxx | 2 +- src/ImageComposer/Makefile.am | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ImageComposer/ImageComposer_Operator.cxx b/src/ImageComposer/ImageComposer_Operator.cxx index 882015e3f..2bf7f219c 100644 --- 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 cbae5a4c4..889c70cc5 100644 --- 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) -- 2.39.2