[hge] Problem on cxImage deprecated use of trans_color

[Michel Rodriguez]

Hi ,
I compiled on a ubuntu 11.04 correctly with cmake files, but I had to modify
src/core/CxImage/ximapng.cpp,  due to deprecation of trans_color and
trans_value. Do you have the same problem ?

A diff :

 diff -r 8838068e622f src/core/CxImage/ximapng.cpp
--- a/src/core/CxImage/ximapng.cpp Tue Aug 23 16:29:20 2011 -0500
+++ b/src/core/CxImage/ximapng.cpp Fri Aug 26 17:11:24 2011 +0200
@@ -142,9 +142,9 @@
  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_color.index;
+ info.nBkgndIndex = info_ptr->trans_values.index;
  } else{
- info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+ info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
  }
  }
  if (info_ptr->num_trans>1){
@@ -152,7 +152,7 @@
  if (pal){
  uint32_t ip;
  for (ip=0;ip<min(head.biClrUsed,(uint32_t)info_ptr->num_trans);ip++)
- pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+ pal[ip].rgbReserved=info_ptr->trans[ip];
  for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
  pal[ip].rgbReserved=255;
  }
@@ -166,9 +166,9 @@
  int32_t num_trans;
  png_color_16 *image_background;
  if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
&image_background)){
- info.nBkgndColor.rgbRed   = (uint8_t)(info_ptr->trans_color.red>>nshift);
- info.nBkgndColor.rgbGreen =
(uint8_t)(info_ptr->trans_color.green>>nshift);
- info.nBkgndColor.rgbBlue  = (uint8_t)(info_ptr->trans_color.blue>>nshift);
+ info.nBkgndColor.rgbRed   = (uint8_t)(info_ptr->trans_values.red>>nshift);
+ info.nBkgndColor.rgbGreen =
(uint8_t)(info_ptr->trans_values.green>>nshift);
+ info.nBkgndColor.rgbBlue  =
(uint8_t)(info_ptr->trans_values.blue>>nshift);
  info.nBkgndColor.rgbReserved = 0;
  info.nBkgndIndex = 0;
  }
@@ -433,12 +433,12 @@
  if (info.nBkgndIndex >= 0){
  info_ptr->num_trans = 1;
  info_ptr->valid |= PNG_INFO_tRNS;
- info_ptr->trans_alpha = trans;
- info_ptr->trans_color.index = (uint8_t)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;
+ info_ptr->trans = trans;
+ info_ptr->trans_values.index = (uint8_t)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;

  // the transparency indexes start from 0 for non grayscale palette
  if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://icculus.org/pipermail/hge/attachments/20110826/b8b14e0f/attachment.htm>