diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/stimg/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/stimg/files')
-rw-r--r-- | media-libs/stimg/files/stimg-0.1.0-libpng15.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/media-libs/stimg/files/stimg-0.1.0-libpng15.patch b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch new file mode 100644 index 000000000000..41ae138f1b1f --- /dev/null +++ b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch @@ -0,0 +1,37 @@ +--- src/png.c ++++ src/png.c +@@ -102,8 +102,8 @@ + 0x00, + NULL); + +- alpha = (info_ptr->channels == 4 || info_ptr->channels == 2) ? 1: 0; +- image = stimg_new(info_ptr->width, info_ptr->height, alpha); ++ alpha = (png_get_channels(png_ptr, info_ptr) == 4 || png_get_channels(png_ptr, info_ptr) == 2) ? 1: 0; ++ image = stimg_new(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), alpha); + + if (image == NULL) { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); +@@ -112,18 +112,18 @@ + } + + row_pointers = png_get_rows(png_ptr, info_ptr); +- row_size = info_ptr->width * (3 + alpha); ++ row_size = png_get_image_width(png_ptr, info_ptr) * (3 + alpha); + data = stimg_get_data(image); +- if (info_ptr->channels > 2) { +- for (i = 0; i < info_ptr->height; i++) { ++ if (png_get_channels(png_ptr, info_ptr) > 2) { ++ for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + memcpy(data + row_size * i, row_pointers[i], row_size); + } + } else { + unsigned char *buf = data; + int x; +- for (i = 0; i < info_ptr->height; i++) { ++ for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + x = 0; +- for (j = 0; j < info_ptr->width; j++) { ++ for (j = 0; j < png_get_image_width(png_ptr, info_ptr); j++) { + buf[0] = buf[1] = buf[2] = row_pointers[i][x]; + if (alpha) { + buf[3] = row_pointers[i][++x]; |