diff options
| author | wiz <wiz@pkgsrc.org> | 2011-02-06 15:37:21 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-02-06 15:37:21 +0000 |
| commit | 34c265b1c9debda175195c9468871c4649294927 (patch) | |
| tree | 8eafb92916811b87dbcb369ee02c8e7b0c8c8a15 /multimedia/mjpegtools | |
| parent | 8eccb1328150aa3540330758accb58a1676c8ba1 (diff) | |
| download | pkgsrc-34c265b1c9debda175195c9468871c4649294927.tar.gz | |
Small improvement to png patch. Non-interlaced pngs now work as inputs.
Interlaced not yet.
Diffstat (limited to 'multimedia/mjpegtools')
| -rw-r--r-- | multimedia/mjpegtools/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mjpegtools/patches/patch-ac | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo index f801fc6e916..ee3cf069677 100644 --- a/multimedia/mjpegtools/distinfo +++ b/multimedia/mjpegtools/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.19 2011/01/29 20:31:19 markd Exp $ +$NetBSD: distinfo,v 1.20 2011/02/06 15:37:21 wiz Exp $ SHA1 (mjpegtools-1.9.0.tar.gz) = 1701233354c7ea86b5b7808c4dd5d03a71118e48 RMD160 (mjpegtools-1.9.0.tar.gz) = 79e0eb4bce468bb8f12da336e29abe8fab390a5f Size (mjpegtools-1.9.0.tar.gz) = 1718063 bytes SHA1 (patch-aa) = 64c2bd92b206060fbaa95a932f0ea18aec17b127 SHA1 (patch-ab) = 5fc460db1593afb1f99422003db86e6b7cfc8eb9 -SHA1 (patch-ac) = b442af0698255b6eede9ac47b178b279a2f7c56d +SHA1 (patch-ac) = f1e935b9a514e29ac18c6a76d19a9f2a685aad3d SHA1 (patch-ad) = 2a6f33fdc9c240d1c5c1172710db7ed95b1fc5a8 SHA1 (patch-ae) = 98bfbaccd8dc79582a32ffbc8dba7b6c039c0373 SHA1 (patch-af) = db90227d0732220123e5900049cf5f3e961432a2 diff --git a/multimedia/mjpegtools/patches/patch-ac b/multimedia/mjpegtools/patches/patch-ac index f552a371836..16c18556ba4 100644 --- a/multimedia/mjpegtools/patches/patch-ac +++ b/multimedia/mjpegtools/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2011/01/24 10:04:21 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2011/02/06 15:37:21 wiz Exp $ Fix build with png-1.5. @@ -66,19 +66,21 @@ Fix build with png-1.5. } return; } -@@ -352,8 +358,10 @@ int decode_png(const char *pngname, int +@@ -352,8 +358,12 @@ int decode_png(const char *pngname, int return -1; } - if (process) + if (process) { ++ png_row_number = 0; + png_set_read_status_fn(png_ptr, read_row_callback); png_set_read_user_transform_fn(png_ptr, png_separation); + } ++ png_set_interlace_handling(png_ptr); png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_STRIP_ALPHA, NULL); if (png_get_IHDR(png_ptr, info_ptr, ¶m->width, ¶m->height, &bit_depth, -@@ -402,7 +410,7 @@ int decode_png(const char *pngname, int +@@ -402,7 +412,7 @@ int decode_png(const char *pngname, int } png_read_end(png_ptr, info_ptr); #endif |