Browse Source

Qt 4.6.3 doesn't compile with QPixmap::convertFromImage

Use QPixmap::fromImage instead
Julien Finet 14 years ago
parent
commit
9794dccaa2
1 changed files with 7 additions and 10 deletions
  1. 7 10
      Libs/DICOM/Core/Testing/Cpp/ctkDICOMImageTest1.cpp

+ 7 - 10
Libs/DICOM/Core/Testing/Cpp/ctkDICOMImageTest1.cpp

@@ -29,21 +29,18 @@ int ctkDICOMImageTest1( int argc, char * argv [] )
   ctkDICOMImage ctkImage(&dcmtkImage);
 
   QLabel qtImage;
-  QPixmap pixmap;
-  if ( pixmap.convertFromImage(ctkImage.getImage(0),Qt::AvoidDither) )
-  {
+  QPixmap pixmap = QPixmap::fromImage(ctkImage.getImage(0),Qt::AvoidDither);
+  if (pixmap.isNull())
+    {
+    std::cerr << "Failed to convert QImage to QPixmap" ;
+    return EXIT_FAILURE;
+    }
   qtImage.setPixmap(pixmap);
   qtImage.show();
 
   if (argc > 2 && QString(argv[2]) == "-I")
     {
-      return app.exec();
+    return app.exec();
     }
   return EXIT_SUCCESS;
 }
-  else
-  {
-    std::cerr << "Failed to convert QImage to QPixmap" ;
-    return EXIT_FAILURE;
-  }
-}