Merge commit '750917f7ea9876d7a97f48aa4b22097fcf7958d9'

This commit is contained in:
Justin Maggard
2014-04-28 10:47:01 -07:00
9 changed files with 15 additions and 16 deletions

View File

@@ -630,7 +630,7 @@ GetImageMetadata(const char *path, char *name)
/* We might need to verify that the thumbnail is 160x160 or smaller */
if( ed->size > 12000 )
{
imsrc = image_new_from_jpeg(NULL, 0, (char *)ed->data, ed->size, 1, ROTATE_NONE);
imsrc = image_new_from_jpeg(NULL, 0, ed->data, ed->size, 1, ROTATE_NONE);
if( imsrc )
{
if( (imsrc->width <= 160) && (imsrc->height <= 160) )