Commit ef1edb08 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixed stack smashing error in PGMImage.

parent ad461c2d

src/TNL/Images/PGMImage_impl.h

+5 −8
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ bool 
PGMImage< Index >::

readHeader()

{

   char magicNumber[ 3 ];

   std::string magicNumber;

   this->file >> magicNumber;

   if( this->file.fail() )

   {
@@ -36,11 +36,10 @@ readHeader() 
      return false;

   }



   if( strcmp( magicNumber, "P5" ) != 0 &&

       strcmp( magicNumber, "P2" ) != 0 )

   if( magicNumber != "P5" && magicNumber != "P2" )

      return false;

 

   if( strcmp( magicNumber, "P5" ) == 0 )

   if(  magicNumber == "P5" )

      this->binary = true;



   char character;
@@ -109,8 +108,6 @@ read( const RegionOfInterest< Index > roi, 
            cell.getCoordinates().x() = j - roi.getLeft();

            cell.getCoordinates().y() = roi.getBottom() - 1 - i;

            cell.refresh();

            //Index cellIndex = grid.getCellIndex( CoordinatesType( j - roi.getLeft(),

            //                                                      roi.getBottom() - 1 - i ) );

            function.getData().setElement( cell.getIndex(), ( Real ) col / ( Real ) this->maxColors );

         }

      }