← Back to branch summary

~ubuntu-branches/debian/sid/gdal/sid

« back to all changes in this revision

Viewing changes to frmts/png/libpng/libpng_gdal.patch

  • Committer: Package Import Robot
  • Author(s): Francesco Paolo Lovergine
  • Date: 2012-05-07 15:04:42 UTC
  • mfrom: (5.5.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120507150442-2eks97loeh6rq005
Tags: 1.9.0-1
* Ready for sid, starting transition.
* All symfiles updated to latest builds.
* Added dh_numpy call in debian/rules to depend on numpy ABI.
* Policy bumped to 3.9.3, no changes required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
frmts/png/libpng/libpng_gdal.patch
 
1
--- /home/even/libpng-1.2.46/pngrutil.c 2011-07-09 12:30:23.000000000 +0200
 
2
+++ pngrutil.c  2011-07-29 19:52:18.831921846 +0200
 
3
@@ -2404,7 +2404,8 @@
 
4
 #endif
 
5
         )
 
6
 #endif
 
7
-          png_chunk_error(png_ptr, "unknown critical chunk");
 
8
+          /* GDAL change : png_chunk_error -> png_chunk_warning */
 
9
+          png_chunk_warning(png_ptr, "unknown critical chunk");
 
10
    }
 
11
 
 
12
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
 
13
@@ -2488,7 +2489,8 @@
 
14
    if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
 
15
        isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
 
16
    {
 
17
-      png_chunk_error(png_ptr, "invalid chunk type");
 
18
+      /* GDAL change : png_chunk_error -> png_chunk_warning */
 
19
+      png_chunk_warning(png_ptr, "invalid chunk type");
 
20
    }
 
21
 }
 
22