omvviewer-git/libpng14-patch.diff

   1 --- a/indra/llimage/llpngwrapper.cpp
   2 +++ b/ndra/llimage/llpngwrapper.cpp
   3 @@ -216,7 +216,7 @@ void LLPngWrapper::normalizeImage()
   4         }
   5      if (mColorType == PNG_COLOR_TYPE_GRAY && mBitDepth < 8)
   6         {
   7 -               png_set_gray_1_2_4_to_8(mReadPngPtr);
   8 +               png_set_expand_gray_1_2_4_to_8(mReadPngPtr);
   9         }
  10         if (mColorType == PNG_COLOR_TYPE_GRAY
  11                 || mColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
  12 @@ -364,7 +364,7 @@ void LLPngWrapper::releaseResources()
  13  {
  14         if (mReadPngPtr || mReadInfoPtr)
  15         {
  16 -               png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, png_infopp_NULL);
  17 +               png_destroy_read_struct(&mReadPngPtr, &mReadInfoPtr, NULL);
  18                 mReadPngPtr = NULL;
  19                 mReadInfoPtr = NULL;
  20         }
  21 --- a/indra/llimage/llpngwrapper.h
  22 +++ b/indra/llimage/llpngwrapper.h
  23 @@ -32,7 +32,7 @@
  24  #ifndef LL_LLPNGWRAPPER_H
  25  #define LL_LLPNGWRAPPER_H
  26
  27 -#include "libpng12/png.h"
  28 +#include "libpng14/png.h"
  29  #include "llimage.h"
  30
  31  class LLPngWrapper