From: Cristy Date: Sat, 10 Mar 2018 21:37:13 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-26~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=117fe7f6cf5dd541fe45ab1431aecf5226988f2c;p=imagemagick ... --- diff --git a/MagickCore/option.c b/MagickCore/option.c index d21f58350..7d6c76c5c 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -177,38 +177,38 @@ static const OptionInfo { "Saturation", GreenChannel, UndefinedOptionFlag, MagickFalse }, { "Y", YellowChannel, UndefinedOptionFlag, MagickFalse }, { "Yellow", YellowChannel, UndefinedOptionFlag, MagickFalse }, - { "0", 1U << 0, UndefinedOptionFlag, MagickFalse }, - { "1", 1U << 1, UndefinedOptionFlag, MagickFalse }, - { "2", 1U << 2, UndefinedOptionFlag, MagickFalse }, - { "3", 1U << 3, UndefinedOptionFlag, MagickFalse }, - { "4", 1U << 4, UndefinedOptionFlag, MagickFalse }, - { "5", 1U << 5, UndefinedOptionFlag, MagickFalse }, - { "6", 1U << 6, UndefinedOptionFlag, MagickFalse }, - { "7", 1U << 7, UndefinedOptionFlag, MagickFalse }, - { "8", 1U << 8, UndefinedOptionFlag, MagickFalse }, - { "9", 1U << 9, UndefinedOptionFlag, MagickFalse }, - { "10", 1U << 10, UndefinedOptionFlag, MagickFalse }, - { "11", 1U << 11, UndefinedOptionFlag, MagickFalse }, - { "12", 1U << 12, UndefinedOptionFlag, MagickFalse }, - { "13", 1U << 13, UndefinedOptionFlag, MagickFalse }, - { "14", 1U << 14, UndefinedOptionFlag, MagickFalse }, - { "15", 1U << 15, UndefinedOptionFlag, MagickFalse }, - { "16", 1U << 16, UndefinedOptionFlag, MagickFalse }, - { "17", 1U << 17, UndefinedOptionFlag, MagickFalse }, - { "18", 1U << 18, UndefinedOptionFlag, MagickFalse }, - { "19", 1U << 19, UndefinedOptionFlag, MagickFalse }, - { "20", 1U << 20, UndefinedOptionFlag, MagickFalse }, - { "21", 1U << 21, UndefinedOptionFlag, MagickFalse }, - { "22", 1U << 22, UndefinedOptionFlag, MagickFalse }, - { "23", 1U << 23, UndefinedOptionFlag, MagickFalse }, - { "24", 1U << 24, UndefinedOptionFlag, MagickFalse }, - { "25", 1U << 25, UndefinedOptionFlag, MagickFalse }, - { "26", 1U << 26, UndefinedOptionFlag, MagickFalse }, - { "27", 1U << 27, UndefinedOptionFlag, MagickFalse }, - { "28", 1U << 28, UndefinedOptionFlag, MagickFalse }, - { "29", 1U << 29, UndefinedOptionFlag, MagickFalse }, - { "30", 1U << 30, UndefinedOptionFlag, MagickFalse }, - { "31", 1U << 31, UndefinedOptionFlag, MagickFalse }, + { "0", (ssize_t) (1L << 0), UndefinedOptionFlag, MagickFalse }, + { "1", (ssize_t) (1L << 1), UndefinedOptionFlag, MagickFalse }, + { "2", (ssize_t) (1L << 2), UndefinedOptionFlag, MagickFalse }, + { "3", (ssize_t) (1L << 3), UndefinedOptionFlag, MagickFalse }, + { "4", (ssize_t) (1L << 4), UndefinedOptionFlag, MagickFalse }, + { "5", (ssize_t) (1L << 5), UndefinedOptionFlag, MagickFalse }, + { "6", (ssize_t) (1L << 6), UndefinedOptionFlag, MagickFalse }, + { "7", (ssize_t) (1L << 7), UndefinedOptionFlag, MagickFalse }, + { "8", (ssize_t) (1L << 8), UndefinedOptionFlag, MagickFalse }, + { "9", (ssize_t) (1L << 9), UndefinedOptionFlag, MagickFalse }, + { "10", (ssize_t) (1L << 10), UndefinedOptionFlag, MagickFalse }, + { "11", (ssize_t) (1L << 11), UndefinedOptionFlag, MagickFalse }, + { "12", (ssize_t) (1L << 12), UndefinedOptionFlag, MagickFalse }, + { "13", (ssize_t) (1L << 13), UndefinedOptionFlag, MagickFalse }, + { "14", (ssize_t) (1L << 14), UndefinedOptionFlag, MagickFalse }, + { "15", (ssize_t) (1L << 15), UndefinedOptionFlag, MagickFalse }, + { "16", (ssize_t) (1L << 16), UndefinedOptionFlag, MagickFalse }, + { "17", (ssize_t) (1L << 17), UndefinedOptionFlag, MagickFalse }, + { "18", (ssize_t) (1L << 18), UndefinedOptionFlag, MagickFalse }, + { "19", (ssize_t) (1L << 19), UndefinedOptionFlag, MagickFalse }, + { "20", (ssize_t) (1L << 20), UndefinedOptionFlag, MagickFalse }, + { "21", (ssize_t) (1L << 21), UndefinedOptionFlag, MagickFalse }, + { "22", (ssize_t) (1L << 22), UndefinedOptionFlag, MagickFalse }, + { "23", (ssize_t) (1L << 23), UndefinedOptionFlag, MagickFalse }, + { "24", (ssize_t) (1L << 24), UndefinedOptionFlag, MagickFalse }, + { "25", (ssize_t) (1L << 25), UndefinedOptionFlag, MagickFalse }, + { "26", (ssize_t) (1L << 26), UndefinedOptionFlag, MagickFalse }, + { "27", (ssize_t) (1L << 27), UndefinedOptionFlag, MagickFalse }, + { "28", (ssize_t) (1L << 28), UndefinedOptionFlag, MagickFalse }, + { "29", (ssize_t) (1L << 29), UndefinedOptionFlag, MagickFalse }, + { "30", (ssize_t) (1L << 30), UndefinedOptionFlag, MagickFalse }, + { "31", (ssize_t) (1L << 31), UndefinedOptionFlag, MagickFalse }, { (char *) NULL, UndefinedChannel, UndefinedOptionFlag, MagickFalse } }, ClassOptions[] =