Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 247292 | Differences between
and this patch

Collapse All | Expand All

(-)xine-lib-1.1.15.orig/src/libxinevdec/image.c (+8 lines)
Lines 110-116 Link Here
110 
    width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
 110 
    width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
111 
    height = MagickGetImageHeight(wand);
 111 
    height = MagickGetImageHeight(wand);
112 
    img_buf = malloc(width * height * 3);
 112 
    img_buf = malloc(width * height * 3);
113 
/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels
114 
 * But upstream did not update their deprecated compat stuff.
115 
 * So do a fun hack to make it work.
116 
 * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org>
117 
 */
118 
#if MagickLibVersion >= 0x645
119 
#define MagickGetImagePixels MagickGetAuthenticPixels
120 
#endif
113 
    MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
 121 
    MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
114 
    DestroyMagickWand(wand);
 122 
    DestroyMagickWand(wand);
115 

          123
          

        

        

          116
          
    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);

          124
          
    _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);

        






  

  Return to bug 247292