From 0c015ee26cf1d18b2be52d4a0f033821a388e386 Mon Sep 17 00:00:00 2001 From: isz Date: Wed, 15 Apr 2015 12:05:11 +0300 Subject: [PATCH] 0025815: Visualization - emit error message in case of texture loading fail Added error message in case when texture cannot be loaded from file. --- src/Image/Image_AlienPixMap.cxx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx index 76a9a0eb72..1077df0ac6 100644 --- a/src/Image/Image_AlienPixMap.cxx +++ b/src/Image/Image_AlienPixMap.cxx @@ -23,6 +23,8 @@ #include #include +#include +#include #include #include #include @@ -262,7 +264,10 @@ bool Image_AlienPixMap::Load (const TCollection_AsciiString& theImagePath) } if ((aFIF == FIF_UNKNOWN) || !FreeImage_FIFSupportsReading (aFIF)) { - // unsupported image format + TCollection_AsciiString aMessage = "Error: image file '"; + aMessage.AssignCat (theImagePath); + aMessage.AssignCat ("' has unsupported file format."); + ::Message::DefaultMessenger()->Send (aMessage, Message_Fail); return false; } @@ -285,6 +290,10 @@ bool Image_AlienPixMap::Load (const TCollection_AsciiString& theImagePath) #endif if (anImage == NULL) { + TCollection_AsciiString aMessage = "Error: image file '"; + aMessage.AssignCat (theImagePath); + aMessage.AssignCat ("' is missing or invalid."); + ::Message::DefaultMessenger()->Send (aMessage, Message_Fail); return false; } @@ -294,6 +303,10 @@ bool Image_AlienPixMap::Load (const TCollection_AsciiString& theImagePath) if (aFormat == Image_PixMap::ImgUNKNOWN) { //anImage = FreeImage_ConvertTo24Bits (anImage); + TCollection_AsciiString aMessage = "Error: image file '"; + aMessage.AssignCat (theImagePath); + aMessage.AssignCat ("' has unsupported pixel format."); + ::Message::DefaultMessenger()->Send (aMessage, Message_Fail); return false; } -- 2.20.1