]> git.pld-linux.org Git - packages/amsn.git/commitdiff
- for new libpng; stolen from ArchLinux
authorduddits <duddits@pld-linux.org>
Tue, 2 Feb 2010 21:44:23 +0000 (21:44 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    amsn-libpng.patch -> 1.1

amsn-libpng.patch [new file with mode: 0644]

diff --git a/amsn-libpng.patch b/amsn-libpng.patch
new file mode 100644 (file)
index 0000000..0b6e2aa
--- /dev/null
@@ -0,0 +1,64 @@
+--- amsn-0.98.1/utils/TkCximage/src/CxImage/ximapng.cpp        2008-03-07 20:14:37.000000000 +0100
++++ amsn-0.98.1-dud/utils/TkCximage/src/CxImage/ximapng.cpp    2010-02-02 22:23:50.352316685 +0100
+@@ -142,9 +142,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
+       if (info_ptr->num_trans!=0){ //palette transparency
+               if (info_ptr->num_trans==1){
+                       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+-                              info.nBkgndIndex = info_ptr->trans_values.index;
++                              info.nBkgndIndex = info_ptr->trans_color.index;
+                       } else{
+-                              info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
++                              info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+                       }
+               }
+               if (info_ptr->num_trans>1){
+@@ -152,7 +152,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+                       if (pal){
+                               DWORD ip;
+                               for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+-                                      pal[ip].rgbReserved=info_ptr->trans[ip];
++                                      pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+                               for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
+                                       pal[ip].rgbReserved=255;
+                               }
+@@ -166,9 +166,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
+               int num_trans;
+               png_color_16 *image_background;
+               if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+-                      info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+-                      info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+-                      info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
++                      info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
++                      info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
++                      info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
+                       info.nBkgndColor.rgbReserved = 0;
+                       info.nBkgndIndex = 0;
+               }
+@@ -417,12 +417,12 @@ bool CxImagePNG::Encode(CxFile *hFile)
+       if (info.nBkgndIndex >= 0){
+               info_ptr->num_trans = 1;
+               info_ptr->valid |= PNG_INFO_tRNS;
+-              info_ptr->trans = trans;
+-              info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
+-              info_ptr->trans_values.red   = tc.rgbRed;
+-              info_ptr->trans_values.green = tc.rgbGreen;
+-              info_ptr->trans_values.blue  = tc.rgbBlue;
+-              info_ptr->trans_values.gray  = info_ptr->trans_values.index;
++              info_ptr->trans_alpha = trans;
++              info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
++              info_ptr->trans_color.red   = tc.rgbRed;
++              info_ptr->trans_color.green = tc.rgbGreen;
++              info_ptr->trans_color.blue  = tc.rgbBlue;
++              info_ptr->trans_color.gray  = info_ptr->trans_color.index;
+               // the transparency indexes start from 0 for non grayscale palette
+               if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -443,7 +443,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+                               trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+                       info_ptr->num_trans = (WORD)nc;
+                       info_ptr->valid |= PNG_INFO_tRNS;
+-                      info_ptr->trans = trans;
++                      info_ptr->trans_alpha = trans;
+               }
+               // copy the palette colors
This page took 0.072931 seconds and 4 git commands to generate.