February 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r32840 - trunk/libmpcodecs/vd_mpng.c
by cboesch 01 Feb '11

01 Feb '11

Author: cboesch Date: Tue Feb 1 21:45:41 2011 New Revision: 32840 Log: Use color type getter instead of direct access to private member. Using the getter is mandatory since recent libpng 1.5 release. Patch by Gianluigi Tiesi (mplayer - netfarm it) Modified: trunk/libmpcodecs/vd_mpng.c Modified: trunk/libmpcodecs/vd_mpng.c ============================================================================== --- trunk/libmpcodecs/vd_mpng.c Tue Feb 1 20:22:43 2011 (r32839) +++ trunk/libmpcodecs/vd_mpng.c Tue Feb 1 21:45:41 2011 (r32840) @@ -74,7 +74,7 @@ static int pngLength; static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size ) { - char * p = pngstr->io_ptr; + char * p = png_get_io_ptr(pngstr); if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer; fast_memcpy( buffer,(char *)&p[pngPointer],size ); pngPointer+=size; @@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh png_uint_32 png_width=0,png_height=0; int depth,color; png_uint_32 i; + png_byte color_type; mp_image_t* mpi; int cols; @@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL ); png_set_bgr( png ); - switch( info->color_type ) { + color_type=png_get_color_type(png, info); + + switch( color_type ) { case PNG_COLOR_TYPE_GRAY_ALPHA: mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" ); break; @@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh out_fmt=IMGFMT_BGR24; break; default: - mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type); + mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type); } // (re)init libvo if image parameters changed (width/height/colorspace)

1 0

r32839 - trunk/sub/subreader.c
by cboesch 01 Feb '11

01 Feb '11

Author: cboesch Date: Tue Feb 1 20:22:43 2011 New Revision: 32839 Log: Use mp_dir_join instead of sprintf. This avoids a potential heap overflow and create a cleaner path: no double "//" in the path for example, or even "\\/" on DOS-like systems. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Tue Feb 1 20:17:33 2011 (r32838) +++ trunk/sub/subreader.c Tue Feb 1 20:22:43 2011 (r32839) @@ -2012,21 +2012,23 @@ static void append_dir_subtitles(struct } if (prio) { + char *subpath; prio += prio; #ifdef CONFIG_ICONV if (i < 3){ // prefer UTF-8 coded prio++; } #endif - sprintf(tmpresult, "%s/%s", path, de->d_name); - // fprintf(stderr, "%s priority %d\n", tmpresult, prio); - if ((f = fopen(tmpresult, "rt"))) { + subpath = mp_dir_join(path, de->d_name); + // fprintf(stderr, "%s priority %d\n", subpath, prio); + if ((f = fopen(subpath, "rt"))) { struct subfn *sub = &slist->subs[slist->sid++]; fclose(f); sub->priority = prio; - sub->fname = strdup(tmpresult); - } + sub->fname = subpath; + } else + free(subpath); } }

1 0

r32838 - in trunk: path.c path.h
by cboesch 01 Feb '11

01 Feb '11

Author: cboesch Date: Tue Feb 1 20:17:33 2011 New Revision: 32838 Log: Add mp_dir_join function. Modified: trunk/path.c trunk/path.h Modified: trunk/path.c ============================================================================== --- trunk/path.c Mon Jan 31 16:45:46 2011 (r32837) +++ trunk/path.c Tue Feb 1 20:17:33 2011 (r32838) @@ -272,3 +272,34 @@ char *mp_path_join(const char *base, con strcat(ret, path); return ret; } + +/** + * @brief Same as mp_path_join but always treat the first parameter as a + * directory. + * @param dir Directory base path. + * @param append Right part to append to dir. + * @return New allocated string with the path, or NULL in case of error. + */ +char *mp_dir_join(const char *dir, const char *append) +{ + char *tmp, *ret; + size_t dirlen = strlen(dir); + size_t i = dirlen - 1; + +#if HAVE_DOS_PATHS + if ((dirlen == 2 && dir[0] && dir[1] == ':') // "X:" only + || dirlen == 0 || dir[i] == '\\' || dir[i] == '/') +#else + if (dirlen == 0 || dir[i] == '/') +#endif + return mp_path_join(dir, append); + + tmp = malloc(dirlen + 2); + if (!tmp) + return NULL; + strcpy(tmp, dir); + strcpy(tmp + dirlen, "/"); + ret = mp_path_join(tmp, append); + free(tmp); + return ret; +} Modified: trunk/path.h ============================================================================== --- trunk/path.h Mon Jan 31 16:45:46 2011 (r32837) +++ trunk/path.h Tue Feb 1 20:17:33 2011 (r32838) @@ -29,5 +29,6 @@ void set_codec_path(const char *path); const char *mp_basename(const char *path); char *mp_dirname(const char *path); char *mp_path_join(const char *base, const char *new_path); +char *mp_dir_join(const char *dir, const char *append); #endif /* MPLAYER_PATH_H */

1 0