File OpenSceneGraph-1.2-libpng14.patch of Package OpenSceneGraph1

Overview Repositories Revisions Requests Users Attributes Meta

File OpenSceneGraph-1.2-libpng14.patch of Package OpenSceneGraph1

Index: OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/png/ReaderWriterPNG.cpp
===================================================================
--- OpenSceneGraph-1.2.orig/OpenSceneGraph/src/osgPlugins/png/ReaderWriterPNG.cpp
+++ OpenSceneGraph-1.2/OpenSceneGraph/src/osgPlugins/png/ReaderWriterPNG.cpp
@@ -135,7 +135,7 @@ class ReaderWriterPNG : public osgDB::Re
             endinfo = png_create_info_struct(png);
 
             fin.read((char*)header,8);
-            if (fin.gcount() == 8 && png_check_sig(header, 8))
+            if (fin.gcount() == 8 && png_sig_cmp(header, 0, 8) == 0)
                 png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream
             else
             {
@@ -186,7 +186,7 @@ class ReaderWriterPNG : public osgDB::Re
             if (color == PNG_COLOR_TYPE_PALETTE)
                 png_set_palette_to_rgb(png);
             if (color == PNG_COLOR_TYPE_GRAY && depth < 8)
-                png_set_gray_1_2_4_to_8(png);
+                png_set_expand_gray_1_2_4_to_8(png);
             if (png_get_valid(png, info, PNG_INFO_tRNS))
                 png_set_tRNS_to_alpha(png);

Places

File OpenSceneGraph-1.2-libpng14.patch of Package OpenSceneGraph1

Places