0028441: Coding Rules - move out nested Image_PixMap::ImgFormat enumeration to dedica...

[occt.git] / src / Graphic3d / Graphic3d_MarkerImage.cxx

diff --git a/src/Graphic3d/Graphic3d_MarkerImage.cxx b/src/Graphic3d/Graphic3d_MarkerImage.cxx
index 9a72f39..7a6c50b 100755 (executable)
--- a/src/Graphic3d/Graphic3d_MarkerImage.cxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx
@@ -94,11 +94,11 @@ Handle(TColStd_HArray1OfByte) Graphic3d_MarkerImage::GetBitMapArray (const Stand
       Quantity_Color aColor = myImage->PixelColor (aColumn, aRow, anAlphaValue);
       Standard_Boolean aBitOn = Standard_False;
 
-      if (myImage->Format() == Image_PixMap::ImgAlpha)
+      if (myImage->Format() == Image_Format_Alpha)
       {
         aBitOn = anAlphaValue > theAlphaValue;
       }
-      else if (myImage->Format() == Image_PixMap::ImgGray)
+      else if (myImage->Format() == Image_Format_Gray)
       {
         aBitOn = aColor.Red() > theAlphaValue;
       }
@@ -142,7 +142,7 @@ const Handle(Image_PixMap)& Graphic3d_MarkerImage::GetImage()
   const Standard_Integer aLowerIndex      = myBitMap->Lower();
 
   myImage = new Image_PixMap();
-  myImage->InitZero (Image_PixMap::ImgAlpha, aSize + myMargin * 2, aSize + myMargin * 2);
+  myImage->InitZero (Image_Format_Alpha, aSize + myMargin * 2, aSize + myMargin * 2);
   for (Standard_Integer aRowIter = 0; aRowIter < myHeight; aRowIter++)
   {
     Standard_Byte* anImageRow = myImage->ChangeRow (aRowIter + aRowOffset);
@@ -169,15 +169,15 @@ const Handle(Image_PixMap)& Graphic3d_MarkerImage::GetImageAlpha()
 
   if (!myImage.IsNull())
   {
-    if (myImage->Format() == Image_PixMap::ImgGray
-     || myImage->Format() == Image_PixMap::ImgAlpha)
+    if (myImage->Format() == Image_Format_Gray
+     || myImage->Format() == Image_Format_Alpha)
     {
       myImageAlpha = myImage;
     }
     else
     {
       myImageAlpha = new Image_PixMap();
-      myImageAlpha->InitZero (Image_PixMap::ImgAlpha, myImage->Width(), myImage->Height());
+      myImageAlpha->InitZero (Image_Format_Alpha, myImage->Width(), myImage->Height());
       myImageAlpha->SetTopDown (Standard_False);
       Quantity_Parameter anAlpha;
       for (Standard_Size aRowIter = 0; aRowIter < myImage->Height(); aRowIter++)