aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-04-25 17:24:24 +0200
committerJustin Lecher <jlec@gentoo.org>2012-04-25 17:24:24 +0200
commitd858ac3b7a4d7f28e524ddaf398a3c39532e7907 (patch)
tree29a84b03937f3c56bba26b40c65bcc69a400a46a /sci-chemistry/coot/files
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-d858ac3b7a4d7f28e524ddaf398a3c39532e7907.tar.gz
sci-d858ac3b7a4d7f28e524ddaf398a3c39532e7907.tar.bz2
sci-d858ac3b7a4d7f28e524ddaf398a3c39532e7907.zip
sci-chemistry/coot: Drop libpng-1.5 patch, included upstream
(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-chemistry/coot/files')
-rw-r--r--sci-chemistry/coot/files/9999-libpng-1.5.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/sci-chemistry/coot/files/9999-libpng-1.5.patch b/sci-chemistry/coot/files/9999-libpng-1.5.patch
deleted file mode 100644
index bddd25169..000000000
--- a/sci-chemistry/coot/files/9999-libpng-1.5.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ccp4mg-utils/ppmutil.cc
-+++ ccp4mg-utils/ppmutil.cc
-@@ -2494,15 +2494,21 @@
-
- pixels = new unsigned char[width*height*colourspace];
-
-+ png_colorp palette;
-+ int num_trans;
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
-+ png_bytep trans_alpha;
-+#endif
-+
- for (int i=0; i<height; i++){
- if(color_type==PNG_COLOR_TYPE_PALETTE){
- for (int j=0; j<width; j++){
-- pixels[i*width*colourspace+j*colourspace] = png_ptr->palette[row_pointers[i][j]].red;
-- pixels[i*width*colourspace+j*colourspace+1] = png_ptr->palette[row_pointers[i][j]].green;
-- pixels[i*width*colourspace+j*colourspace+2] = png_ptr->palette[row_pointers[i][j]].blue;
-- if(row_pointers[i][j]<png_ptr->num_trans){
-+ pixels[i*width*colourspace+j*colourspace] = palette[row_pointers[i][j]].red;
-+ pixels[i*width*colourspace+j*colourspace+1] = palette[row_pointers[i][j]].green;
-+ pixels[i*width*colourspace+j*colourspace+2] = palette[row_pointers[i][j]].blue;
-+ if(row_pointers[i][j]<num_trans){
- #if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
-- pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans_alpha[row_pointers[i][j]];
-+ pixels[i*width*colourspace+j*colourspace+3] = trans_alpha[row_pointers[i][j]];
- #else
- pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans[row_pointers[i][j]];
- #endif